X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=6f0941a296fe51acc66599bf4c0306d2e0cab2bb;hb=28aa5f1d51289406432ce995f435a9977c10f744;hp=117a557c443e97d9e0fb5e3773b8301a53c11248;hpb=300ea88b2932fee0882363e5a18d059fc00d9475;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 117a557..6f0941a 100644 --- a/src/client.c +++ b/src/client.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 Index Data + Copyright (C) 2006-2010 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 @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_CONFIG_H #include #endif - +#include #include #include #include @@ -58,12 +58,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#include "pazpar2.h" +#include "ppmutex.h" +#include "session.h" #include "parameters.h" #include "client.h" #include "connection.h" #include "settings.h" #include "relevance.h" +#include "incref.h" /** \brief Represents client state for a connection to one search target */ struct client { @@ -72,13 +74,17 @@ struct client { struct session *session; char *pquery; // Current search char *cqlquery; // used for SRU targets only - int hits; + Odr_int hits; int record_offset; + int maxrecs; + int startrecs; int diagnostic; enum client_state state; struct show_raw *show_raw; struct client *next; // next client in session or next in free list ZOOM_resultset resultset; + YAZ_MUTEX mutex; + int ref_count; }; struct show_raw { @@ -102,8 +108,6 @@ static const char *client_states[] = { "Client_Disconnected" }; -static struct client *client_freelist = 0; /* thread pr */ - const char *client_get_state_str(struct client *cl) { return client_states[cl->state]; @@ -117,12 +121,16 @@ enum client_state client_get_state(struct client *cl) void client_set_state(struct client *cl, enum client_state st) { cl->state = st; - if (cl->session) + /* no need to check for all client being non-active if this one + already is. Note that session_active_clients also LOCKS session */ +#if 0 + if (!client_is_active(cl) && cl->session) { int no_active = session_active_clients(cl->session); if (no_active == 0) session_alert_watch(cl->session, SESSION_WATCH_SHOW); } +#endif } static void client_show_raw_error(struct client *cl, const char *addinfo); @@ -342,6 +350,11 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type, { strcpy(type, "xml"); } + else if (!strncmp(s, "txml", 4)) + { + const char *cp = strchr(s, ';'); + yaz_snprintf(type, 80, "txml; charset=%s", cp ? cp+1 : "marc-8s"); + } else return -1; return 0; @@ -356,6 +369,11 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type, strcpy(type, "xml"); return 0; } + else if (!strcmp(syntax, "TXML")) + { + strcpy(type, "txml"); + return 0; + } else if (!strcmp(syntax, "USmarc") || !strcmp(syntax, "MARC21")) { strcpy(type, "xml; charset=marc8-s"); @@ -392,23 +410,32 @@ void client_search_response(struct client *cl) struct session *se = cl->session; ZOOM_connection link = connection_get_link(co); ZOOM_resultset resultset = cl->resultset; - const char *error, *addinfo; - + const char *error, *addinfo = 0; + if (ZOOM_connection_error(link, &error, &addinfo)) { cl->hits = 0; client_set_state(cl, Client_Error); yaz_log(YLOG_WARN, "Search error %s (%s): %s", - error, addinfo, client_get_url(cl)); + error, addinfo, client_get_url(cl)); } else { - cl->record_offset = 0; + cl->record_offset = cl->startrecs; cl->hits = ZOOM_resultset_size(resultset); - se->total_hits += cl->hits; + if (se) + se->total_hits += cl->hits; } } +void client_got_records(struct client *cl) +{ + if (cl->session) + { + session_alert_watch(cl->session, SESSION_WATCH_SHOW); + session_alert_watch(cl->session, SESSION_WATCH_RECORD); + } +} void client_record_response(struct client *cl) { @@ -448,31 +475,35 @@ void client_record_response(struct client *cl) if ((rec = ZOOM_resultset_record(resultset, offset))) { cl->record_offset++; - if (ZOOM_record_error(rec, &msg, &addinfo, 0)) + if (cl->session == 0) + ; + else if (ZOOM_record_error(rec, &msg, &addinfo, 0)) + { yaz_log(YLOG_WARN, "Record error %s (%s): %s (rec #%d)", - error, addinfo, client_get_url(cl), + msg, addinfo, client_get_url(cl), cl->record_offset); + } else { struct session_database *sdb = client_get_database(cl); + NMEM nmem = nmem_create(); const char *xmlrec; char type[80]; + if (nativesyntax_to_type(sdb, type, rec)) yaz_log(YLOG_WARN, "Failed to determine record type"); - if ((xmlrec = ZOOM_record_get(rec, type, NULL))) + xmlrec = ZOOM_record_get(rec, type, NULL); + if (!xmlrec) + yaz_log(YLOG_WARN, "ZOOM_record_get failed from %s", + client_get_url(cl)); + else { - if (ingest_record(cl, xmlrec, cl->record_offset)) - { - session_alert_watch(cl->session, SESSION_WATCH_SHOW); - session_alert_watch(cl->session, SESSION_WATCH_RECORD); - } - else - yaz_log(YLOG_WARN, "Failed to ingest"); + if (ingest_record(cl, xmlrec, cl->record_offset, nmem)) + yaz_log(YLOG_WARN, "Failed to ingest from %s", + client_get_url(cl)); } - else - yaz_log(YLOG_WARN, "Failed to extract ZOOM record"); + nmem_destroy(nmem); } - } else { @@ -497,6 +528,7 @@ void client_start_search(struct client *cl) const char *opt_maxrecs = session_setting_oneval(sdb, PZ_MAXRECS); const char *opt_sru = session_setting_oneval(sdb, PZ_SRU); const char *opt_sort = session_setting_oneval(sdb, PZ_SORT); + char maxrecs_str[24], startrecs_str[24]; assert(link); @@ -517,19 +549,26 @@ void client_start_search(struct client *cl) ZOOM_connection_option_set(link, "elementSetName", opt_elements); if (*opt_requestsyn) ZOOM_connection_option_set(link, "preferredRecordSyntax", opt_requestsyn); - if (*opt_maxrecs) - ZOOM_connection_option_set(link, "count", opt_maxrecs); - else + + if (!*opt_maxrecs) { - char n[128]; - sprintf(n, "%d", global_parameters.toget); - ZOOM_connection_option_set(link, "count", n); + sprintf(maxrecs_str, "%d", cl->maxrecs); + opt_maxrecs = maxrecs_str; } + ZOOM_connection_option_set(link, "count", opt_maxrecs); + + + if (atoi(opt_maxrecs) > 20) + ZOOM_connection_option_set(link, "presentChunk", "20"); + else + ZOOM_connection_option_set(link, "presentChunk", opt_maxrecs); + + sprintf(startrecs_str, "%d", cl->startrecs); + ZOOM_connection_option_set(link, "start", startrecs_str); + if (databaseName) ZOOM_connection_option_set(link, "databaseName", databaseName); - ZOOM_connection_option_set(link, "presentChunk", "20"); - if (cl->cqlquery) { ZOOM_query q = ZOOM_query_create(); @@ -552,14 +591,9 @@ void client_start_search(struct client *cl) struct client *client_create(void) { - struct client *r; - if (client_freelist) - { - r = client_freelist; - client_freelist = client_freelist->next; - } - else - r = xmalloc(sizeof(struct client)); + struct client *r = xmalloc(sizeof(*r)); + r->maxrecs = 100; + r->startrecs = 0; r->pquery = 0; r->cqlquery = 0; r->database = 0; @@ -572,37 +606,62 @@ struct client *client_create(void) r->show_raw = 0; r->resultset = 0; r->next = 0; + r->mutex = 0; + pazpar2_mutex_create(&r->mutex, "client"); + + r->ref_count = 1; + return r; } -void client_destroy(struct client *c) +void client_incref(struct client *c) { - struct session *se = c->session; - if (c == se->clients) - se->clients = c->next; - else + pazpar2_incref(&c->ref_count, c->mutex); + yaz_log(YLOG_DEBUG, "client_incref %s %d", client_get_url(c), c->ref_count); +} + +int client_destroy(struct client *c) +{ + if (c) { - struct client *cc; - for (cc = se->clients; cc && cc->next != c; cc = cc->next) - ; - if (cc) - cc->next = c->next; + yaz_log(YLOG_DEBUG, "client_destroy %s %d", + client_get_url(c), c->ref_count); + if (!pazpar2_decref(&c->ref_count, c->mutex)) + { + c->next = 0; + xfree(c->pquery); + c->pquery = 0; + xfree(c->cqlquery); + c->cqlquery = 0; + assert(!c->connection); + assert(!c->resultset); + + yaz_mutex_destroy(&c->mutex); + xfree(c); + return 1; + } } - xfree(c->pquery); - xfree(c->cqlquery); - - if (c->connection) - connection_release(c->connection); - - ZOOM_resultset_destroy(c->resultset); - c->resultset = 0; - c->next = client_freelist; - client_freelist = c; + return 0; } void client_set_connection(struct client *cl, struct connection *con) { - cl->connection = con; + if (cl->resultset) + { + ZOOM_resultset_destroy(cl->resultset); + cl->resultset = 0; + } + if (con) + { + assert(cl->connection == 0); + cl->connection = con; + client_incref(cl); + } + else + { + cl->connection = con; + client_destroy(cl); + } } void client_disconnect(struct client *cl) @@ -683,6 +742,7 @@ int client_parse_query(struct client *cl, const char *query) CCL_bibset ccl_map = prepare_cclmap(cl); 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); if (!ccl_map) return -1; @@ -703,7 +763,26 @@ int client_parse_query(struct client *cl, const char *query) wrbuf_puts(se->wrbuf, pqf_prefix); wrbuf_puts(se->wrbuf, " "); } - ccl_pquery(se->wrbuf, cn); + if (!pqf_strftime || !*pqf_strftime) + ccl_pquery(se->wrbuf, cn); + else + { + time_t cur_time = time(0); + struct tm *tm = localtime(&cur_time); + char tmp_str[300]; + const char *cp = tmp_str; + + /* see man strftime(3) for things .. In particular %% gets converted + to %.. And That's our original query .. */ + strftime(tmp_str, sizeof(tmp_str)-1, pqf_strftime, tm); + for (; *cp; cp++) + { + if (cp[0] == '%') + ccl_pquery(se->wrbuf, cn); + else + wrbuf_putc(se->wrbuf, cp[0]); + } + } xfree(cl->pquery); cl->pquery = xstrdup(wrbuf_cstr(se->wrbuf)); @@ -723,14 +802,37 @@ int client_parse_query(struct client *cl, const char *query) extract_terms(se->nmem, cn, p); se->relevance = relevance_create( se->service->relevance_pct, - se->nmem, (const char **) p, - se->expected_maxrecs); + se->nmem, (const char **) p); } ccl_rpn_delete(cn); return 0; } + +void client_remove_from_session(struct client *c) +{ + struct session *se; + client_incref(c); + + se = c->session; + assert(se); + if (se) + { + struct client **ccp = &se->clients; + + while (*ccp && *ccp != c) + ccp = &(*ccp)->next; + assert(*ccp == c); + *ccp = c->next; + + c->database = 0; + c->session = 0; + c->next = 0; + } + client_destroy(c); +} + void client_set_session(struct client *cl, struct session *se) { cl->session = se; @@ -754,7 +856,7 @@ struct client *client_next_in_session(struct client *cl) } -int client_get_hits(struct client *cl) +Odr_int client_get_hits(struct client *cl) { return cl->hits; } @@ -764,6 +866,11 @@ int client_get_num_records(struct client *cl) return cl->record_offset; } +void client_set_diagnostic(struct client *cl, int diagnostic) +{ + cl->diagnostic = diagnostic; +} + int client_get_diagnostic(struct client *cl) { return cl->diagnostic; @@ -781,7 +888,20 @@ struct host *client_get_host(struct client *cl) const char *client_get_url(struct client *cl) { - return client_get_database(cl)->database->url; + if (cl->database) + return client_get_database(cl)->database->url; + else + return "NOURL"; +} + +void client_set_maxrecs(struct client *cl, int v) +{ + cl->maxrecs = v; +} + +void client_set_startrecs(struct client *cl, int v) +{ + cl->startrecs = v; } /*