X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=6ac2276901ab52b7320176ff703677c2f3bbb765;hb=50aa60919772aeee3ac23a4a5e67a3d6e09a4770;hp=74495fc5feaa449bc09e315124e61655d9405b79;hpb=ab485834bd7708fbdd8e896a7548da22a33fed87;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index 74495fc..6ac2276 100644 --- a/src/session.c +++ b/src/session.c @@ -78,8 +78,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include -#define TERMLIST_HIGH_SCORE 25 - #define MAX_CHUNK 15 #define MAX(a,b) ((a)>(b)?(a):(b)) @@ -231,13 +229,12 @@ void add_facet(struct session *s, const char *type, const char *value, int count } s->termlists[i].name = nmem_strdup(s->nmem, type); - s->termlists[i].termlist - = termlist_create(s->nmem, TERMLIST_HIGH_SCORE); + s->termlists[i].termlist = termlist_create(s->nmem); s->num_termlists = i + 1; } #if 0 - session_log(s, YLOG_DEBUG, "Facets for %s: %s norm:%s (%d)", type, value, wrbuf_cstr(facet_wrbuf), count); + session_log(s, YLOG_LOG, "Facets for %s: %s norm:%s (%d)", type, value, wrbuf_cstr(facet_wrbuf), count); #endif termlist_insert(s->termlists[i].termlist, wrbuf_cstr(display_wrbuf), wrbuf_cstr(facet_wrbuf), count); @@ -622,34 +619,65 @@ int session_is_preferred_clients_ready(struct session *s) return res == 0; } -void session_sort(struct session *se, const char *field, int increasing) +static void session_clear_set(struct session *se, + const char *sort_field, int increasing, int position) +{ + reclist_destroy(se->reclist); + se->reclist = 0; + if (nmem_total(se->nmem)) + session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", + nmem_total(se->nmem)); + nmem_reset(se->nmem); + se->total_records = se->total_merged = 0; + se->num_termlists = 0; + + /* reset list of sorted results and clear to relevance search */ + se->sorted_results = nmem_malloc(se->nmem, sizeof(*se->sorted_results)); + se->sorted_results->field = nmem_strdup(se->nmem, sort_field); + se->sorted_results->increasing = increasing; + se->sorted_results->position = position; + se->sorted_results->next = 0; + + se->reclist = reclist_create(se->nmem); +} + +void session_sort(struct session *se, const char *field, int increasing, + int position) { struct session_sorted_results *sr; struct client_list *l; session_enter(se); + yaz_log(YLOG_LOG, "session_sort field=%s increasing=%d position=%d", field, increasing, position); /* see if we already have sorted for this critieria */ + /* TODO I do not see the point in saving all previous sorts. Dont we re-sort anyway ? */ for (sr = se->sorted_results; sr; sr = sr->next) { - if (!strcmp(field, sr->field) && increasing == sr->increasing) + if (!strcmp(field, sr->field) && increasing == sr->increasing && sr->position == position) break; } if (sr) { - yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d already fetched", - field, increasing); + session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d position=%d already fetched", + field, increasing, position); session_leave(se); return; } - yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d must fetch", - field, increasing); + if (position) + { + session_clear_set(se, field, increasing, position); + } + + session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d position=%d must fetch", + field, increasing, position); sr = nmem_malloc(se->nmem, sizeof(*sr)); sr->field = nmem_strdup(se->nmem, field); sr->increasing = increasing; + sr->position = position; sr->next = se->sorted_results; se->sorted_results = sr; - + for (l = se->clients_active; l; l = l->next) { struct client *cl = l->client; @@ -668,7 +696,8 @@ enum pazpar2_error_code session_search(struct session *se, const char *filter, const char *limit, const char **addinfo, - const char *sort_field, int increasing) + const char *sort_field, + int increasing) { int live_channels = 0; int no_working = 0; @@ -688,29 +717,16 @@ enum pazpar2_error_code session_search(struct session *se, session_reset_active_clients(se, 0); session_enter(se); - reclist_destroy(se->reclist); - se->reclist = 0; se->settings_modified = 0; + session_clear_set(se, sort_field, increasing, 0); /* hardcoded position */ relevance_destroy(&se->relevance); - if (nmem_total(se->nmem)) - session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem)); - nmem_reset(se->nmem); - se->total_records = se->total_merged = 0; - se->num_termlists = 0; - /* reset list of sorted results and clear to relevance search */ - se->sorted_results = nmem_malloc(se->nmem, sizeof(*se->sorted_results)); - se->sorted_results->field = nmem_strdup(se->nmem, sort_field); - se->sorted_results->increasing = increasing; - se->sorted_results->next = 0; - live_channels = select_targets(se, filter); if (!live_channels) { session_leave(se); return PAZPAR2_NO_TARGETS; } - se->reclist = reclist_create(se->nmem); yaz_gettimeofday(&tval); @@ -737,7 +753,7 @@ enum pazpar2_error_code session_search(struct session *se, continue; parse_ret = client_parse_query(cl, query, facet_limits, startrecs, - maxrecs); + maxrecs, se->service->ccl_bibset); if (parse_ret == -1) no_failed_query++; else if (parse_ret == -2) @@ -780,7 +796,7 @@ enum pazpar2_error_code session_search(struct session *se, else return PAZPAR2_NO_TARGETS; } - yaz_log(YLOG_LOG, "session_start_search done"); + session_log(se, YLOG_LOG, "session_start_search done"); return PAZPAR2_NO_ERROR; } @@ -997,23 +1013,6 @@ struct hitsbytarget *get_hitsbytarget(struct session *se, int *count, NMEM nmem) session_leave(se); return p; } - -struct termlist_score **get_termlist_score(struct session *se, - const char *name, int *num) -{ - int i; - struct termlist_score **tl = 0; - - session_enter(se); - for (i = 0; i < se->num_termlists; i++) - if (!strcmp((const char *) se->termlists[i].name, name)) - { - tl = termlist_highscore(se->termlists[i].termlist, num); - break; - } - session_leave(se); - return tl; -} // Compares two hitsbytarget nodes by hitcount static int cmp_ht(const void *p1, const void *p2) @@ -1114,7 +1113,8 @@ void perform_termlist(struct http_channel *c, struct session *se, wrbuf_puts(c->wrbuf, "\">\n"); must_generate_empty = 0; - p = termlist_highscore(se->termlists[i].termlist, &len); + p = termlist_highscore(se->termlists[i].termlist, &len, + nmem_tmp); if (p) { int i; @@ -1626,7 +1626,7 @@ static int check_limit_local(struct client *cl, } ser_md = &service->metadata[md_field_id]; rec_md = record->metadata[md_field_id]; - yaz_log(YLOG_LOG, "check limit local %s", name); + yaz_log(YLOG_DEBUG, "check limit local %s", name); for (i = 0; i < num_v; ) { if (rec_md) @@ -1641,7 +1641,7 @@ static int check_limit_local(struct client *cl, } else { - yaz_log(YLOG_LOG, "cmp: '%s' '%s'", rec_md->data.text.disp, values[i]); + yaz_log(YLOG_DEBUG, "cmp: '%s' '%s'", rec_md->data.text.disp, values[i]); if (!strcmp(rec_md->data.text.disp, values[i])) { // Value equals, should not be filtered. @@ -1795,8 +1795,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; - int rank = 0; - xmlChar *rank_str = 0; + const char *rank; + xmlChar *xml_rank; type = xmlGetProp(n, (xmlChar *) "type"); value = xmlNodeListGetString(xdoc, n->children, 1); @@ -1811,15 +1811,6 @@ static int ingest_to_cluster(struct client *cl, ser_md = &service->metadata[md_field_id]; - rank_str = xmlGetProp(n, (xmlChar *) "rank"); - if (rank_str) - { - rank = atoi((const char *) rank_str); - xmlFree(rank_str); - } - else - rank = ser_md->rank; - if (ser_md->sortkey_offset >= 0) { sk_field_id = ser_md->sortkey_offset; @@ -1832,6 +1823,9 @@ 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; + wheretoput = &cluster->metadata[md_field_id]; // and polulate with data: @@ -1916,7 +1910,6 @@ static int ingest_to_cluster(struct client *cl, } } - // ranking of _all_ fields enabled ... if (rank) { @@ -1944,6 +1937,8 @@ static int ingest_to_cluster(struct client *cl, } // cleaning up + if (xml_rank) + xmlFree(xml_rank); xmlFree(type); xmlFree(value); type = value = 0;