X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.c;h=3fb79b9c9f084ad68886220187b174841defb5a7;hb=512a11133b1ccc4a44d6e971c8a446865136bb15;hp=d81129028233bf17007c14179e8089e9d3035527;hpb=c54c13591e29fa5c3ed08df780301c266bcee8e7;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index d811290..3fb79b9 100644 --- a/src/session.c +++ b/src/session.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2011 Index Data + Copyright (C) 2006-2012 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -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 @@ -95,12 +97,6 @@ struct client_list { struct client_list *next; }; -struct session_sorted_results { - const char *field; - int increasing; - struct session_sorted_results *next; -}; - /* session counting (1) , disable client counting (0) */ static YAZ_MUTEX g_session_mutex = 0; static int no_sessions = 0; @@ -529,13 +525,14 @@ static void select_targets_callback(struct session *se, { cl = client_create(db->database->id); client_set_database(cl, db); - client_set_session(cl, se); l = xmalloc(sizeof(*l)); l->client = cl; l->next = se->clients_cached; se->clients_cached = l; } + /* set session always. If may be 0 if client is not active */ + client_set_session(cl, se); l = xmalloc(sizeof(*l)); l->client = cl; @@ -556,6 +553,11 @@ static void session_reset_active_clients(struct session *se, while (l) { struct client_list *l_next = l->next; + + client_lock(l->client); + client_set_session(l->client, 0); /* mark client inactive */ + client_unlock(l->client); + xfree(l); l = l_next; } @@ -617,31 +619,6 @@ int session_is_preferred_clients_ready(struct session *s) return res == 0; } -static const char *get_strategy_plus_sort(struct client *l, const char *field) -{ - struct session_database *sdb = client_get_database(l); - struct setting *s; - - const char *strategy_plus_sort = 0; - - for (s = sdb->settings[PZ_SORTMAP]; s; s = s->next) - { - char *p = strchr(s->name + 3, ':'); - if (!p) - { - yaz_log(YLOG_WARN, "Malformed sortmap name: %s", s->name); - continue; - } - p++; - if (!strcmp(p, field)) - { - strategy_plus_sort = s->value; - break; - } - } - return strategy_plus_sort; -} - void session_sort(struct session *se, const char *field, int increasing) { struct session_sorted_results *sr; @@ -673,16 +650,10 @@ void session_sort(struct session *se, const char *field, int increasing) for (l = se->clients_active; l; l = l->next) { struct client *cl = l->client; - const char *strategy_plus_sort = get_strategy_plus_sort(cl, field); - if (strategy_plus_sort) - { - struct timeval tval; - if (client_prep_connection(cl, se->service->z3950_operation_timeout, - se->service->z3950_session_timeout, - se->service->server->iochan_man, - &tval)) - client_start_search(cl, strategy_plus_sort, increasing); - } + if (client_get_state(cl) == Client_Connecting || + client_get_state(cl) == Client_Idle || + client_get_state(cl) == Client_Working) + client_start_search(cl); } session_leave(se); } @@ -756,7 +727,6 @@ enum pazpar2_error_code session_search(struct session *se, { int parse_ret; struct client *cl = l->client; - const char *strategy_plus_sort = get_strategy_plus_sort(cl, sort_field); if (prepare_map(se, client_get_database(cl)) < 0) continue; @@ -767,27 +737,24 @@ enum pazpar2_error_code session_search(struct session *se, no_failed_query++; else if (parse_ret == -2) no_failed_limit++; - else if (parse_ret == 0) - { - session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl)); - no_working++; - if (client_prep_connection(cl, se->service->z3950_operation_timeout, - se->service->z3950_session_timeout, - se->service->server->iochan_man, - &tval)) - client_start_search(cl, strategy_plus_sort, increasing); - } else { - session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl)); - no_working++; - if (client_prep_connection(cl, se->service->z3950_operation_timeout, + int r = + client_prep_connection(cl, se->service->z3950_operation_timeout, se->service->z3950_session_timeout, se->service->server->iochan_man, - &tval)) + &tval); + if (parse_ret == 1 && r == 2) { + session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl)); client_reingest(cl); } + else if (r) + { + session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl)); + client_start_search(cl); + } + no_working++; } } facet_limits_destroy(facet_limits); @@ -854,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 @@ -996,8 +962,11 @@ 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].diagnostic = client_get_diagnostic(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); res[*count].connected = client_get_connection(cl) ? 1 : 0; session_settings_dump(se, client_get_database(cl), w); @@ -1045,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++) { @@ -1073,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"); @@ -1086,33 +1073,38 @@ 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(); char **names; int num_names = 0; - if (name) - nmem_strsplit(nmem_tmp, ",", name, &names, &num_names); + if (!name) + name = "*"; + + nmem_strsplit(nmem_tmp, ",", name, &names, &num_names); session_enter(se); for (j = 0; j < num_names; j++) { const char *tname; - - wrbuf_puts(c->wrbuf, "wrbuf, names[j]); - wrbuf_puts(c->wrbuf, "\">\n"); + int must_generate_empty = 1; /* bug 5350 */ for (i = 0; i < se->num_termlists; i++) { tname = se->termlists[i].name; - if (num_names > 0 && !strcmp(names[j], tname)) + if (!strcmp(names[j], tname) || !strcmp(names[j], "*")) { struct termlist_score **p = 0; int len; + + 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) { @@ -1134,14 +1126,26 @@ void perform_termlist(struct http_channel *c, struct session *se, wrbuf_puts(c->wrbuf, "\n"); } } + wrbuf_puts(c->wrbuf, "\n"); } } tname = "xtargets"; - if (num_names > 0 && !strcmp(names[j], tname)) + if (!strcmp(names[j], tname) || !strcmp(names[j], "*")) { - targets_termlist_nb(c->wrbuf, se, num, c->nmem); + wrbuf_puts(c->wrbuf, "wrbuf, tname); + wrbuf_puts(c->wrbuf, "\">\n"); + + 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"); } - wrbuf_puts(c->wrbuf, "\n"); } session_leave(se); nmem_destroy(nmem_tmp); @@ -1195,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; @@ -1209,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 @@ -1228,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)) { @@ -1558,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; } @@ -1580,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) @@ -1598,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; @@ -1627,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; } } @@ -1642,6 +1647,7 @@ static int check_limit_local(struct client *cl, i++; } } + // At end , not match if (i == num_v) { skip_record = 1; @@ -1947,7 +1953,7 @@ void session_log(struct session *s, int level, const char *fmt, ...) va_start(ap, fmt); yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap); - yaz_log(level, "Session (%u): %s", s->session_id, buf); + yaz_log(level, "Session %u: %s", s->session_id, buf); va_end(ap); }