X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=570d15bbed32d34175aa4e2b63c13c8c74bcb2e3;hb=17ef116432f19c9229f95d4708221adb20d64b69;hp=c6b1f214ceb530e099949ae2a275b4dd4758b4e1;hpb=b6d7a5bde6efed3fd29a23e8493b22f4596db8ae;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index c6b1f21..570d15b 100644 --- a/src/session.c +++ b/src/session.c @@ -648,7 +648,8 @@ static void session_clear_set(struct session *se, struct reclist_sortparms *sp) static void session_sort_unlocked(struct session *se, struct reclist_sortparms *sp, - const char *mergekey) + const char *mergekey, + const char *rank) { struct client_list *l; const char *field = sp->name; @@ -659,14 +660,24 @@ static void session_sort_unlocked(struct session *se, session_log(se, YLOG_DEBUG, "session_sort field=%s increasing=%d type=%d", field, increasing, type); - if (mergekey && strcmp(se->mergekey, mergekey)) + if (rank && (!se->rank || strcmp(se->rank, rank))) + { + /* new rank must research/reingest anyway */ + assert(rank); + xfree(se->rank); + se->rank = *rank ? xstrdup(rank) : 0; + clients_research = 1; + session_log(se, YLOG_DEBUG, "session_sort: new rank = %s", + rank); + } + if (mergekey && (!se->mergekey || strcmp(se->mergekey, mergekey))) { /* new mergekey must research/reingest anyway */ assert(mergekey); xfree(se->mergekey); se->mergekey = *mergekey ? xstrdup(mergekey) : 0; clients_research = 1; - session_log(se, YLOG_DEBUG, "search_sort: new mergekey = %s", + session_log(se, YLOG_DEBUG, "session_sort: new mergekey = %s", mergekey); } if (clients_research == 0) @@ -677,12 +688,12 @@ static void session_sort_unlocked(struct session *se, break; if (sr) { - session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d type=%d already fetched", + session_log(se, YLOG_DEBUG, "session_sort: field=%s increasing=%d type=%d already fetched", field, increasing, type); return; } } - session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d type=%d must fetch", + session_log(se, YLOG_DEBUG, "session_sort: field=%s increasing=%d type=%d must fetch", field, increasing, type); // We need to reset reclist on every sort that changes the records, not just for position @@ -699,7 +710,7 @@ static void session_sort_unlocked(struct session *se, if (clients_research) { session_log(se, YLOG_DEBUG, - "Reset results due to %d clients researching", + "session_sort: reset results due to %d clients researching", clients_research); session_clear_set(se, sp); } @@ -712,7 +723,7 @@ static void session_sort_unlocked(struct session *se, sr->type = type; sr->next = se->sorted_results; se->sorted_results = sr; - session_log(se, YLOG_DEBUG, "No research/ingesting done"); + session_log(se, YLOG_DEBUG, "session_sort: no research/ingesting done"); return ; } session_log(se, YLOG_DEBUG, "Re- search/ingesting for clients due to change in sort order"); @@ -725,20 +736,21 @@ static void session_sort_unlocked(struct session *se, client_get_state(cl) == Client_Working) { client_start_search(cl); } - else { + else + { session_log(se, YLOG_DEBUG, - "Client %s: No re-start/ingest in show. Wrong client state: %d", + "session_sort: %s: No re-start/ingest in show. " + "Wrong client state: %d", client_get_id(cl), client_get_state(cl)); } - } } void session_sort(struct session *se, struct reclist_sortparms *sp, - const char *mergekey) + const char *mergekey, const char *rank) { //session_enter(se, "session_sort"); - session_sort_unlocked(se, sp, mergekey); + session_sort_unlocked(se, sp, mergekey, rank); //session_leave(se, "session_sort"); } @@ -751,7 +763,8 @@ enum pazpar2_error_code session_search(struct session *se, const char *limit, const char **addinfo, struct reclist_sortparms *sp, - const char *mergekey) + const char *mergekey, + const char *rank) { int live_channels = 0; int no_working = 0; @@ -777,6 +790,11 @@ enum pazpar2_error_code session_search(struct session *se, xfree(se->mergekey); se->mergekey = *mergekey ? xstrdup(mergekey) : 0; } + if (rank) + { + xfree(se->rank); + se->rank = *rank ? xstrdup(rank) : 0; + } session_clear_set(se, sp); relevance_destroy(&se->relevance); @@ -952,6 +970,7 @@ void session_destroy(struct session *se) relevance_destroy(&se->relevance); reclist_destroy(se->reclist); xfree(se->mergekey); + xfree(se->rank); if (nmem_total(se->nmem)) session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem)); if (nmem_total(se->session_nmem)) @@ -1001,6 +1020,7 @@ struct session *new_session(NMEM nmem, struct conf_service *service, session->sorted_results = 0; session->facet_limits = 0; session->mergekey = 0; + session->rank = 0; for (i = 0; i <= SESSION_WATCH_MAX; i++) { @@ -1881,6 +1901,9 @@ static int ingest_to_cluster(struct client *cl, struct record_cluster *cluster; struct record_metadata **metadata0; struct session_database *sdb = client_get_database(cl); + NMEM ingest_nmem = 0; + char **rank_values = 0; + int rank_num = 0; struct record *record = record_create(se->nmem, service->num_metadata, service->num_sortkeys, cl, @@ -1988,6 +2011,14 @@ static int ingest_to_cluster(struct client *cl, memcpy(metadata0, cluster->metadata, sizeof(*metadata0) * service->num_metadata); + ingest_nmem = nmem_create(); + if (se->rank) + { + yaz_log(YLOG_LOG, "local in sort : %s", se->rank); + nmem_strsplit_escape2(ingest_nmem, ",", se->rank, &rank_values, + &rank_num, 1, '\\', 1); + } + // now parsing XML record and adding data to cluster or record metadata for (n = root->children; n; n = n->next) { @@ -2008,8 +2039,8 @@ static int ingest_to_cluster(struct client *cl, struct record_metadata *rec_md = 0; int md_field_id = -1; int sk_field_id = -1; - const char *rank; - xmlChar *xml_rank; + const char *rank = 0; + xmlChar *xml_rank = 0; type = xmlGetProp(n, (xmlChar *) "type"); value = xmlNodeListGetString(xdoc, n->children, 1); @@ -2039,8 +2070,28 @@ static int ingest_to_cluster(struct client *cl, if (!rec_md) continue; - xml_rank = xmlGetProp(n, (xmlChar *) "rank"); - rank = xml_rank ? (const char *) xml_rank : ser_md->rank; + if (rank_num) + { + int i; + for (i = 0; i < rank_num; i++) + { + const char *val = rank_values[i]; + const char *cp = strchr(val, '='); + if (!cp) + continue; + if ((cp - val) == strlen((const char *) type) + && !memcmp(val, type, cp - val)) + { + rank = cp + 1; + break; + } + } + } + else + { + xml_rank = xmlGetProp(n, (xmlChar *) "rank"); + rank = xml_rank ? (const char *) xml_rank : ser_md->rank; + } wheretoput = &cluster->metadata[md_field_id]; @@ -2179,6 +2230,7 @@ static int ingest_to_cluster(struct client *cl, if (value) xmlFree(value); + nmem_destroy(ingest_nmem); xfree(metadata0); relevance_donerecord(se->relevance, cluster); se->total_records++;