X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=4c6c78084f7309c1df3cab5ae93e26d24539a1e3;hb=9b6c0ddfd2bf29a83a70ecd558cb2dcdb34a30d2;hp=c5b10a8c34d12d0e0ee2eedc1339302338fc4009;hpb=e86cbd0da167e0e72b1d4f180b51a9a9acbbc694;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index c5b10a8..4c6c780 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 @@ -58,11 +58,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#include "pazpar2.h" - +#include "session.h" +#include "parameters.h" #include "client.h" #include "connection.h" #include "settings.h" +#include "relevance.h" /** \brief Represents client state for a connection to one search target */ struct client { @@ -71,12 +72,15 @@ 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; }; struct show_raw { @@ -100,8 +104,6 @@ static const char *client_states[] = { "Client_Disconnected" }; -static struct client *client_freelist = 0; - const char *client_get_state_str(struct client *cl) { return client_states[cl->state]; @@ -157,24 +159,18 @@ static void client_send_raw_present(struct client *cl); static int nativesyntax_to_type(struct session_database *sdb, char *type, ZOOM_record rec); -static void client_show_immediate(struct client *cl, int position, - void *data, - void (*error_handler)(void *data, const char *addinfo), - void (*record_handler)(void *data, const char *buf, - size_t sz), - int binary) +static void client_show_immediate( + ZOOM_resultset resultset, struct session_database *sdb, int position, + void *data, + void (*error_handler)(void *data, const char *addinfo), + void (*record_handler)(void *data, const char *buf, size_t sz), + int binary) { - struct connection *co = cl->connection; - struct session_database *sdb = client_get_database(cl); - ZOOM_resultset resultset = 0; ZOOM_record rec = 0; char type[80]; const char *buf; int len; - assert(co); - - resultset = connection_get_resultset(co); if (!resultset) { error_handler(data, "no resultset"); @@ -208,16 +204,19 @@ int client_show_raw_begin(struct client *cl, int position, size_t sz), int binary) { - if (!cl->connection) - return -1; - if (syntax == 0 && esn == 0) - client_show_immediate(cl, position, data, + client_show_immediate(cl->resultset, client_get_database(cl), + position, data, error_handler, record_handler, binary); else { struct show_raw *rr, **rrp; + + if (!cl->connection) + return -1; + + rr = xmalloc(sizeof(*rr)); rr->position = position; rr->active = 0; @@ -241,7 +240,7 @@ int client_show_raw_begin(struct client *cl, int position, if (cl->state == Client_Failed) { - client_show_raw_error(cl, "client failed"); + client_show_raw_error(cl, "client failed"); } else if (cl->state == Client_Disconnected) { @@ -255,6 +254,13 @@ int client_show_raw_begin(struct client *cl, int position, return 0; } +static void client_show_raw_delete(struct show_raw *r) +{ + xfree(r->syntax); + xfree(r->esn); + xfree(r); +} + void client_show_raw_remove(struct client *cl, void *data) { struct show_raw *rr = data; @@ -264,7 +270,7 @@ void client_show_raw_remove(struct client *cl, void *data) if (*rrp) { *rrp = rr->next; - xfree(rr); + client_show_raw_delete(rr); } } @@ -273,7 +279,7 @@ void client_show_raw_dequeue(struct client *cl) struct show_raw *rr = cl->show_raw; cl->show_raw = rr->next; - xfree(rr); + client_show_raw_delete(rr); } static void client_show_raw_error(struct client *cl, const char *addinfo) @@ -289,7 +295,7 @@ static void client_send_raw_present(struct client *cl) { struct session_database *sdb = client_get_database(cl); struct connection *co = client_get_connection(cl); - ZOOM_resultset set = connection_get_resultset(co); + ZOOM_resultset set = cl->resultset; int offset = cl->show_raw->position; const char *syntax = 0; @@ -385,7 +391,7 @@ void client_search_response(struct client *cl) struct connection *co = cl->connection; struct session *se = cl->session; ZOOM_connection link = connection_get_link(co); - ZOOM_resultset resultset = connection_get_resultset(co); + ZOOM_resultset resultset = cl->resultset; const char *error, *addinfo; if (ZOOM_connection_error(link, &error, &addinfo)) @@ -397,7 +403,7 @@ void client_search_response(struct client *cl) } else { - cl->record_offset = 0; + cl->record_offset = cl->startrecs; cl->hits = ZOOM_resultset_size(resultset); se->total_hits += cl->hits; } @@ -408,7 +414,7 @@ void client_record_response(struct client *cl) { struct connection *co = cl->connection; ZOOM_connection link = connection_get_link(co); - ZOOM_resultset resultset = connection_get_resultset(co); + ZOOM_resultset resultset = cl->resultset; const char *error, *addinfo; if (ZOOM_connection_error(link, &error, &addinfo)) @@ -449,13 +455,14 @@ void client_record_response(struct client *cl) 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))) { - if (ingest_record(cl, xmlrec, cl->record_offset)) + if (!ingest_record(cl, xmlrec, cl->record_offset, nmem)) { session_alert_watch(cl->session, SESSION_WATCH_SHOW); session_alert_watch(cl->session, SESSION_WATCH_RECORD); @@ -465,6 +472,7 @@ void client_record_response(struct client *cl) } else yaz_log(YLOG_WARN, "Failed to extract ZOOM record"); + nmem_destroy(nmem); } } @@ -490,6 +498,8 @@ void client_start_search(struct client *cl) const char *opt_requestsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); 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); @@ -510,24 +520,33 @@ 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(); yaz_log(YLOG_LOG, "Search %s CQL: %s", sdb->database->url, cl->cqlquery); ZOOM_query_cql(q, cl->cqlquery); + if (*opt_sort) + ZOOM_query_sortby(q, opt_sort); rs = ZOOM_connection_search(link, q); ZOOM_query_destroy(q); } @@ -536,20 +555,16 @@ void client_start_search(struct client *cl) yaz_log(YLOG_LOG, "Search %s PQF: %s", sdb->database->url, cl->pquery); rs = ZOOM_connection_search_pqf(link, cl->pquery); } - connection_set_resultset(co, rs); + ZOOM_resultset_destroy(cl->resultset); + cl->resultset = rs; connection_continue(co); } 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; @@ -560,6 +575,7 @@ struct client *client_create(void) r->diagnostic = 0; r->state = Client_Disconnected; r->show_raw = 0; + r->resultset = 0; r->next = 0; return r; } @@ -582,8 +598,9 @@ void client_destroy(struct client *c) if (c->connection) connection_release(c->connection); - c->next = client_freelist; - client_freelist = c; + + ZOOM_resultset_destroy(c->resultset); + xfree(c); } void client_set_connection(struct client *cl, struct connection *con) @@ -640,17 +657,21 @@ static char *make_cqlquery(struct client *cl) char *r; WRBUF wrb = wrbuf_alloc(); int status; + ODR odr_out = odr_createmem(ODR_ENCODE); - zquery = p_query_rpn(global_parameters.odr_out, cl->pquery); + zquery = p_query_rpn(odr_out, cl->pquery); + yaz_log(YLOG_LOG, "PQF: %s", cl->pquery); if ((status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery))) { - yaz_log(YLOG_WARN, "failed to generate CQL query, code=%d", status); - return 0; + yaz_log(YLOG_WARN, "Failed to generate CQL query, code=%d", status); + r = 0; } - r = xstrdup(wrbuf_cstr(wrb)); - + else + { + r = xstrdup(wrbuf_cstr(wrb)); + } wrbuf_destroy(wrb); - odr_reset(global_parameters.odr_out); // releases the zquery + odr_destroy(odr_out); cql_transform_close(cqlt); return r; } @@ -665,6 +686,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; @@ -674,8 +696,9 @@ 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 query for %s", - client_get_database(cl)->database->url); + yaz_log(YLOG_WARN, "Failed to parse CCL query %s for %s", + query, + client_get_database(cl)->database->url); return -1; } wrbuf_rewind(se->wrbuf); @@ -684,7 +707,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)); @@ -703,9 +745,8 @@ int client_parse_query(struct client *cl, const char *query) char *p[512]; extract_terms(se->nmem, cn, p); se->relevance = relevance_create( - global_parameters.server->relevance_pct, - se->nmem, (const char **) p, - se->expected_maxrecs); + se->service->relevance_pct, + se->nmem, (const char **) p); } ccl_rpn_delete(cn); @@ -735,7 +776,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; } @@ -745,6 +786,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; @@ -765,6 +811,16 @@ const char *client_get_url(struct client *cl) return client_get_database(cl)->database->url; } +void client_set_maxrecs(struct client *cl, int v) +{ + cl->maxrecs = v; +} + +void client_set_startrecs(struct client *cl, int v) +{ + cl->startrecs = v; +} + /* * Local variables: * c-basic-offset: 4