X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=a30355bd5269c930415ff44cf34b6a47d1dabd6f;hb=e93b0deb935a47a8dcdcfaf09107b3f0dfd50ca4;hp=a931ca8597bd17eadaa7d0be95a3736318be3d0c;hpb=bc20cb564f2bd34cf9a9edab89e8024bbe5794df;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index a931ca8..a30355b 100644 --- a/src/client.c +++ b/src/client.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 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 @@ -67,23 +67,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "relevance.h" #include "incref.h" -/* client counting (1) , disable client counting (0) */ -#if 1 static YAZ_MUTEX g_mutex = 0; static int no_clients = 0; -static void client_use(int delta) +static int client_use(int delta) { + int clients; if (!g_mutex) yaz_mutex_create(&g_mutex); yaz_mutex_enter(g_mutex); no_clients += delta; + clients = no_clients; yaz_mutex_leave(g_mutex); - yaz_log(YLOG_DEBUG, "%s clients=%d", delta > 0 ? "INC" : "DEC", no_clients); + yaz_log(YLOG_DEBUG, "%s clients=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), clients); + return clients; +} + +int clients_count(void) { + return client_use(0); } -#else -#define client_use(x) -#endif + /** \brief Represents client state for a connection to one search target */ struct client { @@ -103,6 +106,8 @@ struct client { ZOOM_resultset resultset; YAZ_MUTEX mutex; int ref_count; + /* copy of database->url */ + char *url; }; struct show_raw { @@ -447,10 +452,10 @@ static void ingest_raw_record(struct client *cl, ZOOM_record rec) client_show_raw_dequeue(cl); } -static void client_check_preferred_watch(struct client *cl) +void client_check_preferred_watch(struct client *cl) { - yaz_log(YLOG_DEBUG, "client_check_preferred_watch: %s ", client_get_url(cl)); struct session *se = cl->session; + yaz_log(YLOG_DEBUG, "client_check_preferred_watch: %s ", client_get_url(cl)); if (se) { client_unlock(cl); @@ -458,7 +463,7 @@ static void client_check_preferred_watch(struct client *cl) session_alert_watch(se, SESSION_WATCH_SHOW_PREF); } else - yaz_log(YLOG_DEBUG, "client_check_preferred_watch: %s ", client_get_url(cl)); + yaz_log(YLOG_DEBUG, "client_check_preferred_watch: Still locked on preferred targets."); client_lock(cl); } @@ -485,13 +490,16 @@ void client_search_response(struct client *cl) } else { + yaz_log(YLOG_DEBUG, "client_search_response: hits " + ODR_INT_PRINTF, cl->hits); client_report_facets(cl, resultset); cl->record_offset = cl->startrecs; cl->hits = ZOOM_resultset_size(resultset); - if (se) + if (se) { se->total_hits += cl->hits; - if (cl->preferred) - client_check_preferred_watch(cl); + yaz_log(YLOG_DEBUG, "client_search_response: total hits " + ODR_INT_PRINTF, se->total_hits); + } } } @@ -589,6 +597,10 @@ static int client_set_facets_request(struct client *cl, ZOOM_connection link) struct session_database *sdb = client_get_database(cl); const char *opt_facet_term_sort = session_setting_oneval(sdb, PZ_TERMLIST_TERM_SORT); const char *opt_facet_term_count = session_setting_oneval(sdb, PZ_TERMLIST_TERM_COUNT); + + /* Future record filtering on target */ + /* const char *opt_facet_record_filter = session_setting_oneval(sdb, PZ_RECORDFILTER); */ + /* Disable when no count is set */ /* TODO Verify: Do we need to reset the ZOOM facets if a ZOOM Connection is being reused??? */ if (opt_facet_term_count && *opt_facet_term_count) @@ -665,7 +677,8 @@ void client_start_search(struct client *cl) if (opt_preferred) { cl->preferred = atoi(opt_preferred); - yaz_log(YLOG_LOG, "Target %s has preferred: %d", sdb->database->url, cl->preferred); + if (cl->preferred) + yaz_log(YLOG_LOG, "Target %s has preferred status: %d", sdb->database->url, cl->preferred); } client_set_state(cl, Client_Working); @@ -682,18 +695,19 @@ void client_start_search(struct client *cl) if (*opt_requestsyn) ZOOM_connection_option_set(link, "preferredRecordSyntax", opt_requestsyn); - if (!*opt_maxrecs) + if (opt_maxrecs && *opt_maxrecs) { - sprintf(maxrecs_str, "%d", cl->maxrecs); - opt_maxrecs = maxrecs_str; + cl->maxrecs = atoi(opt_maxrecs); } - ZOOM_connection_option_set(link, "count", opt_maxrecs); + /* convert back to string representation used in ZOOM API */ + sprintf(maxrecs_str, "%d", cl->maxrecs); + ZOOM_connection_option_set(link, "count", maxrecs_str); - if (atoi(opt_maxrecs) > 20) + if (cl->maxrecs > 20) ZOOM_connection_option_set(link, "presentChunk", "20"); else - ZOOM_connection_option_set(link, "presentChunk", opt_maxrecs); + ZOOM_connection_option_set(link, "presentChunk", maxrecs_str); sprintf(startrecs_str, "%d", cl->startrecs); ZOOM_connection_option_set(link, "start", startrecs_str); @@ -727,27 +741,28 @@ void client_start_search(struct client *cl) struct client *client_create(void) { - struct client *r = xmalloc(sizeof(*r)); - r->maxrecs = 100; - r->startrecs = 0; - r->pquery = 0; - r->cqlquery = 0; - r->database = 0; - r->connection = 0; - r->session = 0; - r->hits = 0; - r->record_offset = 0; - r->diagnostic = 0; - r->state = Client_Disconnected; - r->show_raw = 0; - r->resultset = 0; - r->mutex = 0; - pazpar2_mutex_create(&r->mutex, "client"); - r->preferred = 0; - r->ref_count = 1; + struct client *cl = xmalloc(sizeof(*cl)); + cl->maxrecs = 100; + cl->startrecs = 0; + cl->pquery = 0; + cl->cqlquery = 0; + cl->database = 0; + cl->connection = 0; + cl->session = 0; + cl->hits = 0; + cl->record_offset = 0; + cl->diagnostic = 0; + cl->state = Client_Disconnected; + cl->show_raw = 0; + cl->resultset = 0; + cl->mutex = 0; + pazpar2_mutex_create(&cl->mutex, "client"); + cl->preferred = 0; + cl->ref_count = 1; + cl->url = 0; client_use(1); - return r; + return cl; } void client_lock(struct client *c) @@ -779,6 +794,7 @@ int client_destroy(struct client *c) c->pquery = 0; xfree(c->cqlquery); c->cqlquery = 0; + xfree(c->url); assert(!c->connection); if (c->resultset) @@ -918,7 +934,7 @@ int client_parse_query(struct client *cl, const char *query) const char *sru = session_setting_oneval(sdb, PZ_SRU); const char *pqf_prefix = session_setting_oneval(sdb, PZ_PQF_PREFIX); const char *pqf_strftime = session_setting_oneval(sdb, PZ_PQF_STRFTIME); - + const char *query_syntax = session_setting_oneval(sdb, PZ_QUERY_SYNTAX); if (!ccl_map) return -1; @@ -927,7 +943,7 @@ int client_parse_query(struct client *cl, const char *query) if (!cn) { client_set_state(cl, Client_Error); - yaz_log(YLOG_WARN, "Failed to parse CCL query %s for %s", + session_log(se, YLOG_WARN, "Failed to parse CCL query '%s' for %s", query, client_get_database(cl)->database->url); return -1; @@ -962,7 +978,11 @@ int client_parse_query(struct client *cl, const char *query) cl->pquery = xstrdup(wrbuf_cstr(se->wrbuf)); xfree(cl->cqlquery); - if (*sru) + + /* Support for PQF on SRU targets. + * TODO Refactor */ + yaz_log(YLOG_DEBUG, "Query syntax: %s", query_syntax); + if (strcmp(query_syntax, "pqf") != 0 && *sru) { if (!strcmp(sru, "solr")) { if (!(cl->cqlquery = make_solrquery(cl))) @@ -1040,6 +1060,10 @@ int client_get_diagnostic(struct client *cl) void client_set_database(struct client *cl, struct session_database *db) { cl->database = db; + /* Copy the URL for safe logging even after session is gone */ + if (db) { + cl->url = xstrdup(db->database->url); + } } struct host *client_get_host(struct client *cl) @@ -1049,9 +1073,10 @@ struct host *client_get_host(struct client *cl) const char *client_get_url(struct client *cl) { - if (cl->database) - return client_get_database(cl)->database->url; + if (cl->url) + return cl->url; else + /* This must not happen anymore, as the url is present until destruction of client */ return "NOURL"; } @@ -1060,6 +1085,11 @@ void client_set_maxrecs(struct client *cl, int v) cl->maxrecs = v; } +int client_get_maxrecs(struct client *cl) +{ + return cl->maxrecs; +} + void client_set_startrecs(struct client *cl, int v) { cl->startrecs = v;