X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.c;h=f07bfcbf28d0ae46910878f950f933429fae4488;hb=b6b190610799a920163200fd5920406adcc3f6c0;hp=a42cedce0e9ab6a0b603d4cdb14675b69b96180b;hpb=946243040b4b9c47fca3d3896a9ba256b3b17fea;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index a42cedc..f07bfcb 100644 --- a/src/session.c +++ b/src/session.c @@ -297,7 +297,8 @@ static void insert_settings_parameters(struct session_database *sdb, // Add static values from session database settings if applicable static void insert_settings_values(struct session_database *sdb, xmlDoc *doc, - struct conf_service *service) + xmlNode *root, + struct conf_service *service) { int i; @@ -312,8 +313,7 @@ static void insert_settings_values(struct session_database *sdb, xmlDoc *doc, const char *val = session_setting_oneval(sdb, offset); if (val) { - xmlNode *r = xmlDocGetRootElement(doc); - xmlNode *n = xmlNewTextChild(r, 0, (xmlChar *) "metadata", + xmlNode *n = xmlNewTextChild(root, 0, (xmlChar *) "metadata", (xmlChar *) val); xmlSetProp(n, (xmlChar *) "type", (xmlChar *) md->name); } @@ -338,17 +338,6 @@ static xmlDoc *normalize_record(struct session *se, { session_log(se, YLOG_WARN, "Normalize failed"); } - else - { - insert_settings_values(sdb, rdoc, service); - - if (global_parameters.dump_records) - { - session_log(se, YLOG_LOG, "Normalized record from %s", - sdb->database->id); - log_xml_doc(rdoc); - } - } } return rdoc; } @@ -951,7 +940,7 @@ void session_apply_setting(struct session *se, char *dbname, char *setting, void session_destroy(struct session *se) { struct session_database *sdb; - session_log(se, YLOG_DEBUG, "Destroying"); + session_log(se, YLOG_LOG, "destroy"); session_use(-1); session_remove_cached_clients(se); @@ -1021,6 +1010,8 @@ struct session *new_session(NMEM nmem, struct conf_service *service, session->normalize_cache = normalize_cache_create(); session->session_mutex = 0; pazpar2_mutex_create(&session->session_mutex, tmp_str); + session_log(session, YLOG_LOG, "create"); + session_use(1); return session; } @@ -1323,9 +1314,10 @@ struct record_cluster **show_range_start(struct session *se, if (se->relevance) { for (spp = sp; spp; spp = spp->next) - if (spp->type == Metadata_sortkey_relevance) + if (spp->type == Metadata_sortkey_relevance + || spp->type == Metadata_sortkey_relevance_h) { - relevance_prepare_read(se->relevance, se->reclist); + relevance_prepare_read(se->relevance, se->reclist, spp->type); break; } for (l = se->clients_active; l; l = l->next) { @@ -1548,12 +1540,12 @@ static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name, return no_found; } -static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no, +static const char *get_mergekey(xmlDoc *doc, xmlNode *root, + struct client *cl, int record_no, struct conf_service *service, NMEM nmem, const char *session_mergekey) { char *mergekey_norm = 0; - xmlNode *root = xmlDocGetRootElement(doc); WRBUF norm_wr = wrbuf_alloc(); xmlChar *mergekey; @@ -1680,34 +1672,38 @@ static int ingest_to_cluster(struct client *cl, static int ingest_sub_record(struct client *cl, xmlDoc *xdoc, xmlNode *root, int record_no, NMEM nmem, - struct session_database *sdb) + struct session_database *sdb, + const char **mergekey_norm) { int ret = 0; - const char *mergekey_norm; struct session *se = client_get_session(cl); struct conf_service *service = se->service; + insert_settings_values(sdb, xdoc, root, service); + if (!check_record_filter(root, sdb)) { - session_log(se, YLOG_LOG, "Filtered out record no %d from %s", record_no, sdb->database->id); - xmlFreeDoc(xdoc); - return -2; + session_log(se, YLOG_LOG, + "Filtered out record no %d from %s", + record_no, sdb->database->id); + return 0; } - - mergekey_norm = get_mergekey(xdoc, cl, record_no, service, nmem, - se->mergekey); - if (!mergekey_norm) + if (!*mergekey_norm) + { + *mergekey_norm = get_mergekey(xdoc, root, cl, record_no, service, nmem, + se->mergekey); + } + if (!*mergekey_norm) { - session_log(se, YLOG_WARN, "Got no mergekey"); - xmlFreeDoc(xdoc); + session_log(se, YLOG_WARN, "Got no mergekey for record no %d from %s", + record_no, sdb->database->id); return -1; } session_enter(se, "ingest_sub_record"); if (client_get_session(cl) == se && se->relevance) - ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm); + ret = ingest_to_cluster(cl, xdoc, root, record_no, *mergekey_norm); session_leave(se, "ingest_sub_record"); - xmlFreeDoc(xdoc); return ret; } @@ -1727,28 +1723,46 @@ int ingest_record(struct client *cl, const char *rec, struct session_database *sdb = client_get_database(cl); struct conf_service *service = se->service; xmlDoc *xdoc = normalize_record(se, sdb, service, rec, nmem); + int r = 0; xmlNode *root; + const char *mergekey_norm = 0; if (!xdoc) return -1; + if (global_parameters.dump_records) + { + session_log(se, YLOG_LOG, "Normalized record from %s", + sdb->database->id); + log_xml_doc(xdoc); + } + root = xmlDocGetRootElement(xdoc); if (!strcmp((const char *) root->name, "cluster")) { - root = root->children; - return ingest_sub_record(cl, xdoc, root, record_no, nmem, sdb); + for (root = root->children; root; root = root->next) + if (root->type == XML_ELEMENT_NODE) + { + r = ingest_sub_record(cl, xdoc, root, record_no, nmem, sdb, + &mergekey_norm); + if (r) + break; + } } else if (!strcmp((const char *) root->name, "record")) { - return ingest_sub_record(cl, xdoc, root, record_no, nmem, sdb); + r = ingest_sub_record(cl, xdoc, root, record_no, nmem, sdb, + &mergekey_norm); } else { session_log(se, YLOG_WARN, "Bad pz root element: %s", (const char *) root->name); - return -1; + r = -1; } + xmlFreeDoc(xdoc); + return r; }