X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.c;h=fde1e78278691cf82f7d17e3c85789e8ff002636;hb=c96388cf56d22b7c919b9e76a850583f007931d7;hp=cdd588c63920f9a615ed8e91c782f9630e8f1573;hpb=5957bba20fb93c8c6829296d6ccf32e52b2114e2;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index cdd588c..fde1e78 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 @@ -523,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; @@ -550,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; } @@ -642,11 +650,9 @@ 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; - struct timeval tval; - if (client_prep_connection(cl, se->service->z3950_operation_timeout, - se->service->z3950_session_timeout, - se->service->server->iochan_man, - &tval)) + 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); @@ -731,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); - } 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); @@ -961,7 +964,9 @@ static struct hitsbytarget *hitsbytarget_nb(struct session *se, res[*count].name = *name ? name : "Unknown"; res[*count].hits = client_get_hits(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); @@ -1010,7 +1015,7 @@ static int cmp_ht(const void *p1, const void *p2) } static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num, - NMEM nmem) + NMEM nmem, int version) { struct hitsbytarget *ht; int count, i; @@ -1037,7 +1042,12 @@ 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) { + wrbuf_printf(wrbuf, "%d\n", ht[i].records); + wrbuf_printf(wrbuf, "%d\n", ht[i].filtered); + } + wrbuf_puts(wrbuf, ""); wrbuf_xmlputs(wrbuf, ht[i].state); wrbuf_puts(wrbuf, "\n"); @@ -1050,33 +1060,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) { @@ -1098,14 +1113,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], "*")) + { + 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) { - targets_termlist_nb(c->wrbuf, se, num, c->nmem); + wrbuf_puts(c->wrbuf, "wrbuf, names[j]); + wrbuf_puts(c->wrbuf, "\"/>\n"); } - wrbuf_puts(c->wrbuf, "\n"); } session_leave(se); nmem_destroy(nmem_tmp); @@ -1522,8 +1549,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; } @@ -1911,7 +1937,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); }