X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=78aad616886117ce0b2fd7344a8378224c75d5aa;hb=116eaa2065a4b4fec0dcc55985170e3364132995;hp=d81129028233bf17007c14179e8089e9d3035527;hpb=c54c13591e29fa5c3ed08df780301c266bcee8e7;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index d811290..78aad61 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 @@ -95,12 +95,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 +523,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 +551,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 +617,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 +648,13 @@ 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); - } + struct timeval tval; + int ret = client_prep_connection(cl, se->service->z3950_operation_timeout, + se->service->z3950_session_timeout, + se->service->server->iochan_man, + &tval, 1); + if (ret) + client_start_search(cl); } session_leave(se); } @@ -756,7 +728,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 +738,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, 0); + if (parse_ret == 1 && r == 2) { + session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl)); client_reingest(cl); } + else + { + session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl)); + client_start_search(cl); + } + no_working++; } } facet_limits_destroy(facet_limits); @@ -997,7 +965,8 @@ 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].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); @@ -1093,8 +1062,10 @@ void perform_termlist(struct http_channel *c, struct session *se, 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); @@ -1102,17 +1073,18 @@ void perform_termlist(struct http_channel *c, struct session *se, { const char *tname; - wrbuf_puts(c->wrbuf, "wrbuf, names[j]); - wrbuf_puts(c->wrbuf, "\">\n"); - 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"); + p = termlist_highscore(se->termlists[i].termlist, &len); if (p) { @@ -1134,14 +1106,19 @@ 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); + wrbuf_puts(c->wrbuf, "\n"); } - wrbuf_puts(c->wrbuf, "\n"); } session_leave(se); nmem_destroy(nmem_tmp); @@ -1947,7 +1924,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); }