X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Flogic.c;h=f9cd08f3f52b81eef0a2c2b140a567e1ce37bf06;hb=ed45a02021c7c5b380aa74acb49b01bdeb974d6e;hp=c76ba2892772682b972e8fa98a72b40d5caa58a7;hpb=8b9b24543393aabb69c0efb0ee9b1390ee9d22f2;p=pazpar2-moved-to-github.git diff --git a/src/logic.c b/src/logic.c index c76ba28..f9cd08f 100644 --- a/src/logic.c +++ b/src/logic.c @@ -68,7 +68,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "client.h" #include "settings.h" #include "normalize7bit.h" -#include "marcmap.h" #define TERMLIST_HIGH_SCORE 25 @@ -154,7 +153,7 @@ static void add_facet(struct session *s, const char *type, const char *value) termlist_insert(s->termlists[i].termlist, value); } -xmlDoc *record_to_xml(struct session_database *sdb, const char *rec) +static xmlDoc *record_to_xml(struct session_database *sdb, const char *rec) { struct database *db = sdb->database; xmlDoc *rdoc = 0; @@ -241,55 +240,32 @@ static void insert_settings_values(struct session_database *sdb, xmlDoc *doc, } } -xmlDoc *normalize_record(struct session_database *sdb, struct session *se, - const char *rec) +static xmlDoc *normalize_record(struct session_database *sdb, + struct session *se, + const char *rec) { - struct database_retrievalmap *m; xmlDoc *rdoc = record_to_xml(sdb, rec); + if (rdoc) { - for (m = sdb->map; m; m = m->next) + char *parms[MAX_XSLT_ARGS*2+1]; + + insert_settings_parameters(sdb, se, parms); + + if (normalize_record_transform(sdb->map, &rdoc, (const char **)parms)) + { + yaz_log(YLOG_WARN, "Normalize failed from %s", sdb->database->url); + } + else { - xmlDoc *new = 0; + insert_settings_values(sdb, rdoc, se->service); + if (global_parameters.dump_records) { - xmlNodePtr root = 0; - char *parms[MAX_XSLT_ARGS*2+1]; - - insert_settings_parameters(sdb, se, parms); - - if (m->stylesheet) - { - new = xsltApplyStylesheet(m->stylesheet, rdoc, (const char **) parms); - } - else if (m->marcmap) - { - new = marcmap_apply(m->marcmap, rdoc); - } - - root = xmlDocGetRootElement(new); - - if (!new || !root || !(root->children)) - { - yaz_log(YLOG_WARN, "XSLT transformation failed from %s", - sdb->database->url); - xmlFreeDoc(new); - xmlFreeDoc(rdoc); - return 0; - } + yaz_log(YLOG_LOG, "Normalized record from %s", + sdb->database->url); + log_xml_doc(rdoc); } - - xmlFreeDoc(rdoc); - rdoc = new; - } - - insert_settings_values(sdb, rdoc, se->service); - - if (global_parameters.dump_records) - { - yaz_log(YLOG_LOG, "Normalized record from %s", - sdb->database->url); - log_xml_doc(rdoc); } } return rdoc; @@ -320,9 +296,6 @@ static int prepare_map(struct session *se, struct session_database *sdb) } if ((s = session_setting_oneval(sdb, PZ_XSLT))) { - char **stylesheets; - struct database_retrievalmap **m = &sdb->map; - int num, i; char auto_stylesheet[256]; if (!strcmp(s, "auto")) @@ -347,41 +320,11 @@ static int prepare_map(struct session *se, struct session_database *sdb) yaz_log(YLOG_WARN, "No pz:requestsyntax for auto stylesheet"); } } - nmem_strsplit(se->session_nmem, ",", s, &stylesheets, &num); - for (i = 0; i < num; i++) - { - (*m) = nmem_malloc(se->session_nmem, sizeof(**m)); - (*m)->next = 0; - - // XSLT - if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-4], ".xsl")) - { - (*m)->marcmap = NULL; - if (!((*m)->stylesheet = conf_load_stylesheet(se->service, stylesheets[i]))) - { - yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load stylesheet: %s", - stylesheets[i]); - return -1; - } - } - // marcmap - else if (!strcmp(&stylesheets[i][strlen(stylesheets[i])-5], ".mmap")) - { - (*m)->stylesheet = NULL; - if (!((*m)->marcmap = marcmap_load(stylesheets[i], se->session_nmem))) - { - yaz_log(YLOG_FATAL|YLOG_ERRNO, "Unable to load marcmap: %s", - stylesheets[i]); - return -1; - } - } - - m = &(*m)->next; - } + sdb->map = normalize_cache_get(se->normalize_cache, + se->service, s); + if (!sdb->map) + return -1; } - if (!sdb->map) - yaz_log(YLOG_WARN, "No Normalization stylesheet for target %s", - sdb->database->url); return 0; } @@ -500,10 +443,14 @@ static struct database_criterion *parse_filter(NMEM m, const char *buf) int subnum; int subi; struct database_criterion *new = nmem_malloc(m, sizeof(*new)); - char *eq = strchr(values[i], '='); + char *eq; + if ((eq = strchr(values[i], '='))) + new->type = PAZPAR2_STRING_MATCH; + if ((eq = strchr(values[i], '~'))) + new->type = PAZPAR2_SUBSTRING_MATCH; if (!eq) { - yaz_log(YLOG_WARN, "Missing equal-sign in filter"); + yaz_log(YLOG_WARN, "Missing equal-signi/tilde in filter"); return 0; } *(eq++) = '\0'; @@ -556,27 +503,27 @@ enum pazpar2_error_code search(struct session *se, for (cl = se->clients; cl; cl = client_next_in_session(cl)) { if (prepare_session_database(se, client_get_database(cl)) < 0) - { - *addinfo = client_get_database(cl)->database->url; - return PAZPAR2_CONFIG_TARGET; - } + continue; // Parse query for target if (client_parse_query(cl, query) < 0) no_failed++; else { no_working++; - if (client_prep_connection(cl, se->service->z3950_connect_timeout, - se->service->z3950_session_timeout)) + if (client_prep_connection(cl, se->service->z3950_operation_timeout, + se->service->z3950_session_timeout)) client_start_search(cl); } } - - // If no queries could be mapped, we signal an error if (no_working == 0) { - *addinfo = "query"; - return PAZPAR2_MALFORMED_PARAMETER_VALUE; + if (no_failed > 0) + { + *addinfo = "query"; + return PAZPAR2_MALFORMED_PARAMETER_VALUE; + } + else + return PAZPAR2_NO_TARGETS; } return PAZPAR2_NO_ERROR; } @@ -609,10 +556,7 @@ static void session_init_databases_fun(void *context, struct database *db) // Doesn't free memory associated with sdb -- nmem takes care of that static void session_database_destroy(struct session_database *sdb) { - struct database_retrievalmap *m; - - for (m = sdb->map; m; m = m->next) - xsltFreeStylesheet(m->stylesheet); + sdb->map = 0; } // Initialize session_database list -- this represents this session's view @@ -683,10 +627,6 @@ void session_apply_setting(struct session *se, char *dbname, char *setting, case PZ_XSLT: if (sdb->map) { - struct database_retrievalmap *m; - // We don't worry about the map structure -- it's in nmem - for (m = sdb->map; m; m = m->next) - xsltFreeStylesheet(m->stylesheet); sdb->map = 0; } break; @@ -701,6 +641,7 @@ void destroy_session(struct session *s) client_destroy(s->clients); for (sdb = s->databases; sdb; sdb = sdb->next) session_database_destroy(sdb); + normalize_cache_destroy(s->normalize_cache); nmem_destroy(s->nmem); service_destroy(s->service); wrbuf_destroy(s->wrbuf); @@ -732,6 +673,8 @@ struct session *new_session(NMEM nmem, struct conf_service *service) session->watchlist[i].data = 0; session->watchlist[i].fun = 0; } + session->normalize_cache = normalize_cache_create(); + return session; } @@ -940,15 +883,60 @@ static struct record_metadata *record_metadata_init( return rec_md; } +static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name, + struct conf_service *service, WRBUF norm_wr) +{ + xmlNode *n; + int no_found = 0; + for (n = root->children; n; n = n->next) + { + if (n->type != XML_ELEMENT_NODE) + continue; + if (!strcmp((const char *) n->name, "metadata")) + { + xmlChar *type = xmlGetProp(n, (xmlChar *) "type"); + if (!strcmp(name, (const char *) type)) + { + xmlChar *value = xmlNodeListGetString(doc, n->children, 1); + if (value) + { + const char *norm_str; + pp2_relevance_token_t prt = + pp2_relevance_tokenize( + service->mergekey_pct, + (const char *) value); + + wrbuf_puts(norm_wr, name); + wrbuf_puts(norm_wr, "="); + while ((norm_str = + pp2_relevance_token_next(prt))) + { + if (*norm_str) + { + if (wrbuf_len(norm_wr)) + wrbuf_puts(norm_wr, " "); + wrbuf_puts(norm_wr, norm_str); + } + } + xmlFree(value); + pp2_relevance_token_destroy(prt); + no_found++; + } + } + xmlFree(type); + } + } + return no_found; +} + static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no, struct conf_service *service, NMEM nmem) { char *mergekey_norm = 0; xmlNode *root = xmlDocGetRootElement(doc); WRBUF norm_wr = wrbuf_alloc(); - xmlNode *n; - /* create mergekey based on mergekey attribute from XSL (if any) */ + /* consider mergekey from XSL first */ xmlChar *mergekey = xmlGetProp(root, (xmlChar *) "mergekey"); if (mergekey) { @@ -970,53 +958,25 @@ static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no, pp2_relevance_token_destroy(prt); xmlFree(mergekey); } - /* append (if any) mergekey=yes metadata values */ - for (n = root->children; n; n = n->next) + else { - if (n->type != XML_ELEMENT_NODE) - continue; - if (!strcmp((const char *) n->name, "metadata")) + /* no mergekey defined in XSL. Look for mergekey metadata instead */ + int field_id; + for (field_id = 0; field_id < service->num_metadata; field_id++) { - struct conf_metadata *ser_md = 0; - int md_field_id = -1; - - xmlChar *type = xmlGetProp(n, (xmlChar *) "type"); - - if (!type) - continue; - - md_field_id - = conf_service_metadata_field_id(service, - (const char *) type); - if (md_field_id >= 0) + struct conf_metadata *ser_md = &service->metadata[field_id]; + if (ser_md->mergekey != Metadata_mergekey_no) { - ser_md = &service->metadata[md_field_id]; - if (ser_md->mergekey == Metadata_mergekey_yes) + int r = get_mergekey_from_doc(doc, root, ser_md->name, + service, norm_wr); + if (r == 0 && ser_md->mergekey == Metadata_mergekey_required) { - xmlChar *value = xmlNodeListGetString(doc, n->children, 1); - if (value) - { - const char *norm_str; - pp2_relevance_token_t prt = - pp2_relevance_tokenize( - service->mergekey_pct, - (const char *) value); - - while ((norm_str = pp2_relevance_token_next(prt))) - { - if (*norm_str) - { - if (wrbuf_len(norm_wr)) - wrbuf_puts(norm_wr, " "); - wrbuf_puts(norm_wr, norm_str); - } - } - xmlFree(value); - pp2_relevance_token_destroy(prt); - } + /* no mergekey on this one and it is required.. + Generate unique key instead */ + wrbuf_rewind(norm_wr); + break; } } - xmlFree(type); } } @@ -1032,20 +992,6 @@ static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no, return mergekey_norm; } -static const char *str_tok_n(const char *s, const char *delim, - const char **res, size_t *len) -{ - *res = s; - while (*s && !strchr(delim, *s)) - s++; - *len = s - *res; - if (*len == 0) - return 0; - if (*s && strchr(delim, *s)) - s++; - return s; -} - /** \brief see if metadata for pz:recordfilter exists \param root xml root element of normalized record \param sdb session database for client @@ -1075,21 +1021,22 @@ static int check_record_filter(xmlNode *root, struct session_database *sdb) xmlChar *type = xmlGetProp(n, (xmlChar *) "type"); if (type) { - const char *s1 = s; size_t len; - const char *value; - while ((s1 = str_tok_n(s1, ",", &value, &len)) != 0) + const char *eq = strchr(s, '='); + if (eq) + len = eq - s; + else + len = strlen(s); + if (len == strlen((const char *)type) && + !memcmp((const char *) type, s, len)) { - if (len == strlen((const char *)type) && - !memcmp((const char *) type, s, len)) + xmlChar *value = xmlNodeGetContent(n); + if (value && *value) { - xmlChar *value = xmlNodeGetContent(n); - if (value && *value) - { - xmlFree(value); + if (!eq || strstr((const char *) value, eq+1)) match = 1; - } } + xmlFree(value); } xmlFree(type); }