X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.c;h=8edaa8dc8a7e84ea03ebab25d37121ed9acf2b71;hb=164c2d7f655059826a900183fa44e76bb8618303;hp=3a0fc22cd82c894760a1c8cb377224df8ba686a9;hpb=848a659ecc0b24d1881c3f091393b99259130aa7;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index 3a0fc22..8edaa8d 100644 --- a/src/session.c +++ b/src/session.c @@ -412,16 +412,8 @@ static int prepare_map(struct session *se, struct session_database *sdb) { const char *s; - if (sdb->settings[PZ_EMBED_XSLT] && - (s = session_setting_oneval(sdb, PZ_EMBED_XSLT))) - { - sdb->map = normalize_cache_get(se->normalize_cache, - se->service, s, 1); - if (!sdb->map) - return -1; - } - else if (sdb->settings[PZ_XSLT] && - (s = session_setting_oneval(sdb, PZ_XSLT))) + if (sdb->settings[PZ_XSLT] && + (s = session_setting_oneval(sdb, PZ_XSLT))) { char auto_stylesheet[256]; @@ -449,7 +441,7 @@ static int prepare_map(struct session *se, struct session_database *sdb) } } sdb->map = normalize_cache_get(se->normalize_cache, - se->service, s, 0); + se->service, s); if (!sdb->map) return -1; } @@ -630,34 +622,64 @@ 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) +{ + 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->next = 0; + + se->reclist = reclist_create(se->nmem); +} + +void session_sort(struct session *se, const char *field, int increasing, + int clear_set) { struct session_sorted_results *sr; struct client_list *l; session_enter(se); - /* see if we already have sorted for this critieria */ - for (sr = se->sorted_results; sr; sr = sr->next) + yaz_log(YLOG_LOG, "session_sort field=%s", field); + if (clear_set) { - if (!strcmp(field, sr->field) && increasing == sr->increasing) - break; + session_clear_set(se, field, increasing); } - if (sr) + else { - yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d already fetched", - field, increasing); - session_leave(se); - return; + /* see if we already have sorted for this critieria */ + for (sr = se->sorted_results; sr; sr = sr->next) + { + if (!strcmp(field, sr->field) && increasing == sr->increasing) + break; + } + if (sr) + { + session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d already fetched", + field, increasing); + session_leave(se); + return; + } + session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d must fetch", + field, increasing); + sr = nmem_malloc(se->nmem, sizeof(*sr)); + sr->field = nmem_strdup(se->nmem, field); + sr->increasing = increasing; + sr->next = se->sorted_results; + se->sorted_results = sr; } - yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d must fetch", - field, increasing); - sr = nmem_malloc(se->nmem, sizeof(*sr)); - sr->field = nmem_strdup(se->nmem, field); - sr->increasing = increasing; - sr->next = se->sorted_results; - se->sorted_results = sr; - + for (l = se->clients_active; l; l = l->next) { struct client *cl = l->client; @@ -696,27 +718,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); relevance_destroy(&se->relevance); - 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); @@ -743,7 +754,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) @@ -757,12 +768,12 @@ enum pazpar2_error_code session_search(struct session *se, &tval); if (parse_ret == 1 && r == 2) { - session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl)); + session_log(se, YLOG_LOG, "client %s REUSE result", client_get_id(cl)); client_reingest(cl); } else if (r) { - session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl)); + session_log(se, YLOG_LOG, "client %s NEW search", client_get_id(cl)); client_start_search(cl); } no_working++; @@ -786,7 +797,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; } @@ -896,6 +907,10 @@ void session_destroy(struct session *se) normalize_cache_destroy(se->normalize_cache); relevance_destroy(&se->relevance); reclist_destroy(se->reclist); + if (nmem_total(se->nmem)) + session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem)); + if (nmem_total(se->session_nmem)) + session_log(se, YLOG_DEBUG, "NMEN session usage %zd", nmem_total(se->session_nmem)); nmem_destroy(se->nmem); service_destroy(se->service); yaz_mutex_destroy(&se->session_mutex); @@ -1628,7 +1643,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) @@ -1643,7 +1658,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. @@ -1797,8 +1812,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); @@ -1813,15 +1828,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; @@ -1834,6 +1840,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: @@ -1918,7 +1927,6 @@ static int ingest_to_cluster(struct client *cl, } } - // ranking of _all_ fields enabled ... if (rank) { @@ -1946,6 +1954,8 @@ static int ingest_to_cluster(struct client *cl, } // cleaning up + if (xml_rank) + xmlFree(xml_rank); xmlFree(type); xmlFree(value); type = value = 0;