X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=2bb56f023ee9ddda751c6239818206dce7ad15ea;hb=b0a0617d5a32baf5abfa286d116d3a9f5fe6ca5c;hp=662937f95d11111d5eca501cce6382f2cca13d53;hpb=c4cfa1ee86d30d432d711d1f498fa3d6f1a2360d;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 662937f..2bb56f0 100644 --- a/src/client.c +++ b/src/client.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2013 Index Data + Copyright (C) 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 @@ -71,6 +71,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "relevance.h" #include "incref.h" +#define XDOC_CACHE_SIZE 100 + static YAZ_MUTEX g_mutex = 0; static int no_clients = 0; @@ -121,6 +123,7 @@ struct client { int same_search; char *sort_strategy; char *sort_criteria; + xmlDoc **xdoc; }; struct suggestions { @@ -192,6 +195,50 @@ void client_set_state(struct client *cl, enum client_state st) } } +static void client_init_xdoc(struct client *cl) +{ + int i; + + cl->xdoc = xmalloc(sizeof(*cl->xdoc) * XDOC_CACHE_SIZE); + for (i = 0; i < XDOC_CACHE_SIZE; i++) + cl->xdoc[i] = 0; +} + +static void client_destroy_xdoc(struct client *cl) +{ + int i; + + assert(cl->xdoc); + for (i = 0; i < XDOC_CACHE_SIZE; i++) + if (cl->xdoc[i]) + xmlFreeDoc(cl->xdoc[i]); + xfree(cl->xdoc); +} + +xmlDoc *client_get_xdoc(struct client *cl, int record_no) +{ + assert(cl->xdoc); + if (record_no >= 0 && record_no < XDOC_CACHE_SIZE) + return cl->xdoc[record_no]; + return 0; +} + +void client_store_xdoc(struct client *cl, int record_no, xmlDoc *xdoc) +{ + assert(cl->xdoc); + if (record_no >= 0 && record_no < XDOC_CACHE_SIZE) + { + if (cl->xdoc[record_no]) + xmlFreeDoc(cl->xdoc[record_no]); + cl->xdoc[record_no] = xdoc; + } + else + { + xmlFreeDoc(xdoc); + } +} + + static void client_show_raw_error(struct client *cl, const char *addinfo); struct connection *client_get_connection(struct client *cl) @@ -571,10 +618,28 @@ static void client_record_ingest(struct client *cl) ZOOM_record rec = 0; ZOOM_resultset resultset = cl->resultset; struct session *se = client_get_session(cl); + xmlDoc *xdoc; + int offset = cl->record_offset + 1; /* 0 versus 1 numbered offsets */ - if ((rec = ZOOM_resultset_record_immediate(resultset, cl->record_offset))) + xdoc = client_get_xdoc(cl, offset); + if (xdoc) + { + if (cl->session) + { + NMEM nmem = nmem_create(); + int rc = ingest_xml_record(cl, xdoc, offset, nmem, 1); + if (rc == -1) + session_log(se, YLOG_WARN, + "Failed to ingest xdoc from %s #%d", + client_get_id(cl), offset); + else if (rc == -2) + cl->filtered++; + nmem_destroy(nmem); + } + } + else if ((rec = ZOOM_resultset_record_immediate(resultset, + cl->record_offset))) { - int offset = ++cl->record_offset; if (cl->session == 0) ; /* no operation */ else if (ZOOM_record_error(rec, &msg, &addinfo, 0)) @@ -606,7 +671,7 @@ static void client_record_ingest(struct client *cl) else { /* OK = 0, -1 = failure, -2 = Filtered */ - int rc = ingest_record(cl, xmlrec, cl->record_offset, nmem); + int rc = ingest_record(cl, xmlrec, offset, nmem); if (rc == -1) { const char *rec_syn = ZOOM_record_get(rec, "syntax", NULL); @@ -618,8 +683,8 @@ static void client_record_ingest(struct client *cl) s ? s : "null", type, rec_syn ? rec_syn : "null"); } - if (rc == -2) - cl->filtered += 1; + else if (rc == -2) + cl->filtered++; } nmem_destroy(nmem); } @@ -627,8 +692,9 @@ static void client_record_ingest(struct client *cl) else { session_log(se, YLOG_WARN, "Got NULL record from %s #%d", - client_get_id(cl), cl->record_offset); + client_get_id(cl), offset); } + cl->record_offset++; } void client_record_response(struct client *cl, int *got_records) @@ -867,12 +933,15 @@ int client_start_search(struct client *cl) /* Nothing has changed and we already have a result */ if (cl->same_search == 1 && rc_prep_connection == 2) { - session_log(se, YLOG_LOG, "client %s REUSE result", client_get_id(cl)); + session_log(se, YLOG_LOG, "client %s resuse result", client_get_id(cl)); + client_report_facets(cl, cl->resultset); return client_reingest(cl); } else if (!rc_prep_connection) { - session_log(se, YLOG_LOG, "client %s FAILED to search: No connection.", client_get_id(cl)); + session_log(se, YLOG_LOG, "client %s postponing search: No connection", + client_get_id(cl)); + client_set_state_nb(cl, Client_Working); return -1; } co = client_get_connection(cl); @@ -880,11 +949,14 @@ int client_start_search(struct client *cl) link = connection_get_link(co); assert(link); - session_log(se, YLOG_LOG, "client %s NEW search", client_get_id(cl)); + session_log(se, YLOG_LOG, "client %s new search", client_get_id(cl)); cl->diagnostic = 0; cl->filtered = 0; + client_destroy_xdoc(cl); + client_init_xdoc(cl); + if (extra_args && *extra_args) ZOOM_connection_option_set(link, "extraArgs", extra_args); @@ -998,6 +1070,7 @@ struct client *client_create(const char *id) cl->sort_criteria = 0; assert(id); cl->id = xstrdup(id); + client_init_xdoc(cl); client_use(1); yaz_log(YLOG_DEBUG, "client_create c=%p %s", cl, id); @@ -1043,6 +1116,7 @@ int client_destroy(struct client *c) assert(!c->connection); facet_limits_destroy(c->facet_limits); + client_destroy_xdoc(c); if (c->resultset) { ZOOM_resultset_destroy(c->resultset); @@ -1341,7 +1415,7 @@ static int apply_limit(struct session_database *sdb, // return -1 on query error // return -2 on limit error int client_parse_query(struct client *cl, const char *query, - facet_limits_t facet_limits) + facet_limits_t facet_limits, const char **error_msg) { struct session *se = client_get_session(cl); struct conf_service *service = se->service; @@ -1386,6 +1460,8 @@ int client_parse_query(struct client *cl, const char *query, ccl_qual_rm(&ccl_map); if (!cn) { + if (error_msg) + *error_msg = ccl_err_msg(cerror); client_set_state(cl, Client_Error); session_log(se, YLOG_WARN, "Client %s: Failed to parse CCL query '%s'", client_get_id(cl), @@ -1444,6 +1520,7 @@ int client_parse_query(struct client *cl, const char *query, session_log(se, YLOG_WARN, "Invalid PQF query for Client %s: %s", client_get_id(cl), cl->pquery); ret_value = -1; + *error_msg = "Invalid PQF after CCL to PQF conversion"; } else { @@ -1458,7 +1535,10 @@ int client_parse_query(struct client *cl, const char *query, else cl->cqlquery = make_cqlquery(cl, zquery); if (!cl->cqlquery) + { + *error_msg = "Cannot convert PQF to Solr/CQL"; ret_value = -1; + } else session_log(se, YLOG_LOG, "Client %s native query: %s (%s)", client_get_id(cl), cl->cqlquery, sru); @@ -1487,6 +1567,8 @@ int client_parse_sort(struct client *cl, struct reclist_sortparms *sp) const char *sort_strategy_and_spec = get_strategy_plus_sort(cl, sp->name); int increasing = sp->increasing; + if (!strcmp(sp->name, "relevance")) + increasing = 1; if (sort_strategy_and_spec && strlen(sort_strategy_and_spec) < 40) { char strategy[50], *p;