X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.c;h=54b82daa1210b6ea64f4dcd7f820536b28e78bc3;hb=96707c992b975c2c9b500bd6a5075b5631e32e26;hp=3e00cc10fa0d9603b76c9ab0bff1a0a4f057a851;hpb=e78a02092641952d74a56396c6d281b225888cd1;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index 3e00cc1..54b82da 100644 --- a/src/session.c +++ b/src/session.c @@ -76,6 +76,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "settings.h" #include "normalize7bit.h" +#include + #define TERMLIST_HIGH_SCORE 25 #define MAX_CHUNK 15 @@ -741,13 +743,13 @@ enum pazpar2_error_code session_search(struct session *se, client_prep_connection(cl, se->service->z3950_operation_timeout, se->service->z3950_session_timeout, se->service->server->iochan_man, - &tval, 0); + &tval); if (parse_ret == 1 && r == 2) { session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl)); client_reingest(cl); } - else + else if (r) { session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl)); client_start_search(cl); @@ -819,8 +821,7 @@ void session_init_databases(struct session *se) static struct session_database *load_session_database(struct session *se, char *id) { - struct database *db = new_database(id, se->session_nmem); - + struct database *db = new_database_inherit_settings(id, se->session_nmem, se->service->settings); session_init_databases_fun((void*) se, db); // New sdb is head of se->databases list @@ -961,7 +962,9 @@ static struct hitsbytarget *hitsbytarget_nb(struct session *se, res[*count].id = client_get_id(cl); res[*count].name = *name ? name : "Unknown"; res[*count].hits = client_get_hits(cl); + res[*count].approximation = client_get_approximation(cl); res[*count].records = client_get_num_records(cl); + res[*count].filtered = client_get_num_records_filtered(cl); res[*count].diagnostic = client_get_diagnostic(cl, &res[*count].addinfo); res[*count].state = client_get_state_str(cl); @@ -1011,14 +1014,25 @@ static int cmp_ht(const void *p1, const void *p2) return h2->hits - h1->hits; } +// Compares two hitsbytarget nodes by hitcount +static int cmp_ht_approx(const void *p1, const void *p2) +{ + const struct hitsbytarget *h1 = p1; + const struct hitsbytarget *h2 = p2; + return h2->approximation - h1->approximation; +} + static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num, - NMEM nmem) + NMEM nmem, int version) { struct hitsbytarget *ht; int count, i; ht = hitsbytarget_nb(se, &count, nmem); - qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht); + if (version >= 2) + qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht_approx); + else + qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht); for (i = 0; i < count && i < num && ht[i].hits > 0; i++) { @@ -1039,7 +1053,14 @@ static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num, wrbuf_printf(wrbuf, "" ODR_INT_PRINTF "\n", ht[i].hits); - + + if (version >= 2) { + // Should not print if we know it isn't a approximation. + wrbuf_printf(wrbuf, "" ODR_INT_PRINTF "\n", ht[i].approximation); + wrbuf_printf(wrbuf, "%d\n", ht[i].records - ht[i].filtered); + wrbuf_printf(wrbuf, "%d\n", ht[i].filtered); + } + wrbuf_puts(wrbuf, ""); wrbuf_xmlputs(wrbuf, ht[i].state); wrbuf_puts(wrbuf, "\n"); @@ -1052,7 +1073,7 @@ static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num, } void perform_termlist(struct http_channel *c, struct session *se, - const char *name, int num) + const char *name, int num, int version) { int i, j; NMEM nmem_tmp = nmem_create(); @@ -1069,7 +1090,8 @@ void perform_termlist(struct http_channel *c, struct session *se, for (j = 0; j < num_names; j++) { const char *tname; - + int must_generate_empty = 1; /* bug 5350 */ + for (i = 0; i < se->num_termlists; i++) { tname = se->termlists[i].name; @@ -1081,6 +1103,7 @@ void perform_termlist(struct http_channel *c, struct session *se, wrbuf_puts(c->wrbuf, "wrbuf, tname); wrbuf_puts(c->wrbuf, "\">\n"); + must_generate_empty = 0; p = termlist_highscore(se->termlists[i].termlist, &len); if (p) @@ -1113,8 +1136,15 @@ void perform_termlist(struct http_channel *c, struct session *se, wrbuf_xmlputs(c->wrbuf, tname); wrbuf_puts(c->wrbuf, "\">\n"); - targets_termlist_nb(c->wrbuf, se, num, c->nmem); + targets_termlist_nb(c->wrbuf, se, num, c->nmem, version); wrbuf_puts(c->wrbuf, "\n"); + must_generate_empty = 0; + } + if (must_generate_empty) + { + wrbuf_puts(c->wrbuf, "wrbuf, names[j]); + wrbuf_puts(c->wrbuf, "\"/>\n"); } } session_leave(se); @@ -1169,7 +1199,7 @@ void show_single_stop(struct session *se, struct record_cluster *rec) struct record_cluster **show_range_start(struct session *se, struct reclist_sortparms *sp, - int start, int *num, int *total, Odr_int *sumhits) + int start, int *num, int *total, Odr_int *sumhits, Odr_int *approx_hits) { struct record_cluster **recs; struct reclist_sortparms *spp; @@ -1183,7 +1213,8 @@ struct record_cluster **show_range_start(struct session *se, { *num = 0; *total = 0; - *sumhits = 0; + *sumhits = 0; + *approx_hits = 0; recs = 0; } else @@ -1202,9 +1233,11 @@ struct record_cluster **show_range_start(struct session *se, *total = reclist_get_num_records(se->reclist); *sumhits = 0; - for (l = se->clients_active; l; l = l->next) + *approx_hits = 0; + for (l = se->clients_active; l; l = l->next) { *sumhits += client_get_hits(l->client); - + *approx_hits += client_get_approximation(l->client); + } for (i = 0; i < start; i++) if (!reclist_read_record(se->reclist)) { @@ -1532,8 +1565,7 @@ int ingest_record(struct client *cl, const char *rec, if (!check_record_filter(root, sdb)) { - session_log(se, YLOG_LOG, "Filtered out record no %d from %s", - record_no, sdb->database->id); + session_log(se, YLOG_LOG, "Filtered out record no %d from %s", record_no, sdb->database->id); xmlFreeDoc(xdoc); return -2; } @@ -1554,6 +1586,7 @@ int ingest_record(struct client *cl, const char *rec, return ret; } +// Skip record on non-zero static int check_limit_local(struct client *cl, struct record *record, int record_no) @@ -1572,9 +1605,7 @@ static int check_limit_local(struct client *cl, char **values = 0; int i, num_v = 0; - const char *name = - client_get_facet_limit_local(cl, sdb, &l, nmem_tmp, &num_v, - &values); + const char *name = client_get_facet_limit_local(cl, sdb, &l, nmem_tmp, &num_v, &values); if (!name) break; @@ -1601,10 +1632,10 @@ 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_LOG, "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. break; } } @@ -1616,6 +1647,7 @@ static int check_limit_local(struct client *cl, i++; } } + // At end , not match if (i == num_v) { skip_record = 1; @@ -1754,6 +1786,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; type = xmlGetProp(n, (xmlChar *) "type"); value = xmlNodeListGetString(xdoc, n->children, 1); @@ -1767,6 +1801,15 @@ static int ingest_to_cluster(struct client *cl, continue; 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) { @@ -1866,10 +1909,11 @@ static int ingest_to_cluster(struct client *cl, // ranking of _all_ fields enabled ... - if (ser_md->rank) + if (rank) + { relevance_countwords(se->relevance, cluster, - (char *) value, ser_md->rank, - ser_md->name); + (char *) value, rank, ser_md->name); + } // construct facets ... unless the client already has reported them if (ser_md->termlist && !client_has_facet(cl, (char *) type))