X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=2002c69e5802e76ac5202aa2987e7a0eae009591;hb=19a0803f7298f5a0d583f5f70582ba29cb373265;hp=0618d3a6179c98046d56b5a7a092689f8027a0d6;hpb=d71af70a6a3546cab2e370140d47c1bd628d9753;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 0618d3a..2002c69 100644 --- a/src/client.c +++ b/src/client.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2012 Index Data + Copyright (C) 2006-2013 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 @@ -86,15 +86,18 @@ static int client_use(int delta) no_clients_total += delta; clients = no_clients; yaz_mutex_leave(g_mutex); - yaz_log(YLOG_DEBUG, "%s clients=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), clients); + yaz_log(YLOG_DEBUG, "%s clients=%d", + delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), clients); return clients; } -int clients_count(void) { +int clients_count(void) +{ return client_use(0); } -int clients_count_total(void) { +int clients_count_total(void) +{ int total = 0; if (!g_mutex) return 0; @@ -115,6 +118,7 @@ struct client { char *addinfo; // diagnostic info for most resent error Odr_int hits; int record_offset; + int show_stat_no; int filtered; // When using local:, this will count the number of filtered records. int maxrecs; int startrecs; @@ -220,11 +224,6 @@ struct session *client_get_session(struct client *cl) return cl->session; } -const char *client_get_pquery(struct client *cl) -{ - return cl->pquery; -} - static void client_send_raw_present(struct client *cl); static int nativesyntax_to_type(const char *s, char *type, ZOOM_record rec); @@ -358,7 +357,7 @@ void client_show_raw_remove(struct client *cl, void *data) } } -void client_show_raw_dequeue(struct client *cl) +static void client_show_raw_dequeue(struct client *cl) { struct show_raw *rr = cl->show_raw; @@ -454,7 +453,7 @@ static int nativesyntax_to_type(const char *s, char *type, * TODO Consider thread safety!!! * */ -void client_report_facets(struct client *cl, ZOOM_resultset rs) +static void client_report_facets(struct client *cl, ZOOM_resultset rs) { struct session_database *sdb = client_get_database(cl); ZOOM_facet_field *facets = ZOOM_resultset_facets(rs); @@ -554,10 +553,13 @@ void client_search_response(struct client *cl) client_report_facets(cl, resultset); cl->record_offset = cl->startrecs; cl->hits = ZOOM_resultset_size(resultset); - yaz_log(YLOG_DEBUG, "client_search_response: hits " ODR_INT_PRINTF, cl->hits); + yaz_log(YLOG_DEBUG, "client_search_response: hits " ODR_INT_PRINTF, + cl->hits); if (cl->suggestions) client_suggestions_destroy(cl); - cl->suggestions = client_suggestions_create(ZOOM_resultset_option_get(resultset, "suggestions")); + cl->suggestions = + client_suggestions_create(ZOOM_resultset_option_get( + resultset, "suggestions")); } } @@ -588,9 +590,8 @@ static void client_record_ingest(struct client *cl) if ((rec = ZOOM_resultset_record_immediate(resultset, cl->record_offset))) { int offset = ++cl->record_offset; - if (cl->session == 0) { - /* no operation */ - } + if (cl->session == 0) + ; /* no operation */ else if (ZOOM_record_error(rec, &msg, &addinfo, 0)) { session_log(se, YLOG_WARN, "Record error %s (%s): %s #%d", @@ -645,7 +646,7 @@ static void client_record_ingest(struct client *cl) } } -void client_record_response(struct client *cl) +void client_record_response(struct client *cl, int *got_records) { struct connection *co = cl->connection; ZOOM_connection link = connection_get_link(co); @@ -678,6 +679,7 @@ void client_record_response(struct client *cl) else { client_record_ingest(cl); + *got_records = 1; } } } @@ -762,6 +764,58 @@ static const char *get_strategy_plus_sort(struct client *l, const char *field) return strategy_plus_sort; } +void client_update_show_stat(struct client *cl, int cmd) +{ + if (cmd == 0) + cl->show_stat_no = 0; + else if (cmd == 1) + cl->show_stat_no++; +} + +int client_fetch_more(struct client *cl) +{ + struct session_database *sdb = client_get_database(cl); + const char *str; + int extend_recs = 0; + int number = cl->hits - cl->record_offset; + + str = session_setting_oneval(sdb, PZ_EXTENDRECS); + if (!str || !*str) + return 0; + + extend_recs = atoi(str); + + yaz_log(YLOG_LOG, "cl=%s show_stat_no=%d got=%d", + client_get_id(cl), cl->show_stat_no, cl->record_offset); + if (cl->show_stat_no < cl->record_offset) + return 0; + yaz_log(YLOG_LOG, "cl=%s Trying to fetch more", client_get_id(cl)); + + if (number > extend_recs) + number = extend_recs; + if (number > 0) + { + ZOOM_resultset set = cl->resultset; + struct connection *co = client_get_connection(cl); + + str = session_setting_oneval(sdb, PZ_REQUESTSYNTAX); + ZOOM_resultset_option_set(set, "preferredRecordSyntax", str); + str = session_setting_oneval(sdb, PZ_ELEMENTS); + if (str && *str) + ZOOM_resultset_option_set(set, "elementSetName", str); + + ZOOM_resultset_records(set, 0, cl->record_offset, number); + client_set_state(cl, Client_Working); + connection_continue(co); + return 1; + } + else + { + yaz_log(YLOG_LOG, "cl=%s. OK no more in total set", client_get_id(cl)); + } + return 0; +} + int client_parse_init(struct client *cl, int same_search) { cl->same_search = same_search; @@ -771,7 +825,8 @@ int client_parse_init(struct client *cl, int same_search) /* * TODO consider how to extend the range * */ -int client_parse_range(struct client *cl, const char *startrecs, const char *maxrecs) +int client_parse_range(struct client *cl, const char *startrecs, + const char *maxrecs) { if (maxrecs && atoi(maxrecs) != cl->maxrecs) { @@ -897,19 +952,22 @@ int client_start_search(struct client *cl) query = ZOOM_query_create(); if (cl->cqlquery) { - yaz_log(YLOG_LOG, "Client %s: Search CQL: %s", client_get_id(cl), cl->cqlquery); + yaz_log(YLOG_LOG, "Client %s: Search CQL: %s", client_get_id(cl), + cl->cqlquery); ZOOM_query_cql(query, cl->cqlquery); if (*opt_sort) ZOOM_query_sortby(query, opt_sort); } else { - yaz_log(YLOG_LOG, "Client %s: Search PQF: %s", client_get_id(cl), cl->pquery); + yaz_log(YLOG_LOG, "Client %s: Search PQF: %s", client_get_id(cl), + cl->pquery); ZOOM_query_prefix(query, cl->pquery); } if (cl->sort_strategy && cl->sort_criteria) { - yaz_log(YLOG_LOG, "Client %s: Setting ZOOM sort strategy and criteria: %s %s", + yaz_log(YLOG_LOG, "Client %s: " + "Set ZOOM sort strategy and criteria: %s %s", client_get_id(cl), cl->sort_strategy, cl->sort_criteria); ZOOM_query_sortby2(query, cl->sort_strategy, cl->sort_criteria); } @@ -1036,7 +1094,6 @@ void client_disconnect(struct client *cl) client_set_connection(cl, 0); } - // Initialize CCL map for a target static CCL_bibset prepare_cclmap(struct client *cl, CCL_bibset base_bibset) { @@ -1174,7 +1231,8 @@ const char *client_get_facet_limit_local(struct client *cl, static int apply_limit(struct session_database *sdb, facet_limits_t facet_limits, - WRBUF w_pqf, CCL_bibset ccl_map) + WRBUF w_pqf, CCL_bibset ccl_map, + struct conf_service *service) { int ret = 0; int i = 0; @@ -1262,14 +1320,28 @@ static int apply_limit(struct session_database *sdb, sdb->database->id, cvalue); ret = -1; /* bad limitmap */ } - break; } + break; } } if (!s) { - yaz_log(YLOG_WARN, "Target %s: limit %s used, but no limitmap defined", - (sdb->database ? sdb->database->id : ""), name); + int i; + for (i = 0; i < service->num_metadata; i++) + { + struct conf_metadata *md = service->metadata + i; + if (!strcmp(md->name, name) && md->limitcluster) + { + yaz_log(YLOG_LOG, "limitcluster in use for %s", + md->name); + break; + } + } + if (i == service->num_metadata) + { + yaz_log(YLOG_WARN, "Target %s: limit %s used, but no limitmap defined", + (sdb->database ? sdb->database->id : ""), name); + } } } nmem_destroy(nmem_tmp); @@ -1283,15 +1355,15 @@ 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, - CCL_bibset bibset) + facet_limits_t facet_limits) { struct session *se = client_get_session(cl); + struct conf_service *service = se->service; struct session_database *sdb = client_get_database(cl); struct ccl_rpn_node *cn; int cerror, cpos; ODR odr_out; - CCL_bibset ccl_map = prepare_cclmap(cl, bibset); + CCL_bibset ccl_map = prepare_cclmap(cl, service->ccl_bibset); 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); @@ -1313,7 +1385,7 @@ int client_parse_query(struct client *cl, const char *query, wrbuf_puts(w_pqf, " "); } - if (apply_limit(sdb, facet_limits, w_pqf, ccl_map)) + if (apply_limit(sdb, facet_limits, w_pqf, ccl_map, service)) { ccl_qual_rm(&ccl_map); return -2; @@ -1322,7 +1394,8 @@ int client_parse_query(struct client *cl, const char *query, facet_limits_destroy(cl->facet_limits); cl->facet_limits = facet_limits_dup(facet_limits); - yaz_log(YLOG_LOG, "Client %s: CCL query: %s limit: %s", client_get_id(cl), wrbuf_cstr(w_ccl), wrbuf_cstr(w_pqf)); + yaz_log(YLOG_LOG, "Client %s: CCL query: %s limit: %s", + client_get_id(cl), wrbuf_cstr(w_ccl), wrbuf_cstr(w_pqf)); cn = ccl_find_str(ccl_map, wrbuf_cstr(w_ccl), &cerror, &cpos); ccl_qual_rm(&ccl_map); if (!cn) @@ -1362,7 +1435,8 @@ int client_parse_query(struct client *cl, const char *query, if (!cl->pquery || strcmp(cl->pquery, wrbuf_cstr(w_pqf))) { if (cl->pquery) - session_log(se, YLOG_LOG, "Client %s: Re-search due query/limit change: %s to %s", + session_log(se, YLOG_LOG, "Client %s: " + "Re-search due query/limit change: %s to %s", client_get_id(cl), cl->pquery, wrbuf_cstr(w_pqf)); xfree(cl->pquery); cl->pquery = xstrdup(wrbuf_cstr(w_pqf)); @@ -1442,7 +1516,9 @@ int client_parse_sort(struct client *cl, struct reclist_sortparms *sp) strcat(p, " <"); else strcat(p, " >"); - yaz_log(YLOG_LOG, "Client %s: applying sorting %s %s", client_get_id(cl), strategy, p); + yaz_log(YLOG_LOG, "Client %s: " + "applying sorting %s %s", client_get_id(cl), + strategy, p); if (!cl->sort_strategy || strcmp(cl->sort_strategy, strategy)) cl->same_search = 0; if (!cl->sort_criteria || strcmp(cl->sort_criteria, p)) @@ -1455,14 +1531,19 @@ int client_parse_sort(struct client *cl, struct reclist_sortparms *sp) } } else { - yaz_log(YLOG_LOG, "Client %s: Invalid sort strategy and spec found %s", client_get_id(cl), sort_strategy_and_spec); + yaz_log(YLOG_LOG, "Client %s: " + "Invalid sort strategy and spec found %s", + client_get_id(cl), sort_strategy_and_spec); xfree(cl->sort_strategy); cl->sort_strategy = 0; xfree(cl->sort_criteria); cl->sort_criteria = 0; } - } else { - yaz_log(YLOG_DEBUG, "Client %s: No sort strategy and spec found.", client_get_id(cl)); + } + else + { + yaz_log(YLOG_DEBUG, "Client %s: " + "No sort strategy and spec found.", client_get_id(cl)); xfree(cl->sort_strategy); cl->sort_strategy = 0; xfree(cl->sort_criteria); @@ -1505,9 +1586,13 @@ Odr_int client_get_hits(struct client *cl) Odr_int client_get_approximation(struct client *cl) { - if (cl->record_offset > 0) { - Odr_int approx = ((10 * cl->hits * (cl->record_offset - cl->filtered)) / cl->record_offset + 5) /10; - yaz_log(YLOG_DEBUG, "%s: Approx: %lld * %d / %d = %lld ", client_get_id(cl), cl->hits, cl->record_offset - cl->filtered, cl->record_offset, approx); + if (cl->record_offset > 0) + { + Odr_int approx = ((10 * cl->hits * (cl->record_offset - cl->filtered)) + / cl->record_offset + 5) /10; + yaz_log(YLOG_DEBUG, "%s: Approx: %lld * %d / %d = %lld ", + client_get_id(cl), cl->hits, + cl->record_offset - cl->filtered, cl->record_offset, approx); return approx; } return cl->hits; @@ -1550,17 +1635,16 @@ const char * client_get_suggestions_xml(struct client *cl, WRBUF wrbuf) /* int idx; */ struct suggestions *suggestions = cl->suggestions; - if (!suggestions) { - //yaz_log(YLOG_DEBUG, "No suggestions found"); + if (!suggestions) return ""; - } - if (suggestions->passthrough) { - yaz_log(YLOG_DEBUG, "Passthrough Suggestions: \n%s\n", suggestions->passthrough); + if (suggestions->passthrough) + { + yaz_log(YLOG_DEBUG, "Passthrough Suggestions: \n%s\n", + suggestions->passthrough); return suggestions->passthrough; } - if (suggestions->num == 0) { + if (suggestions->num == 0) return ""; - } /* for (idx = 0; idx < suggestions->num; idx++) { wrbuf_printf(wrbuf, "suggest[idx]); @@ -1618,7 +1702,8 @@ struct suggestions* client_suggestions_create(const char* suggestions_string) nmem_strsplit_escape2(suggestions->nmem, "\n", suggestions_string, &suggestions->suggest, &suggestions->num, 1, '\\', 0); /* Set up misspelled array */ - suggestions->misspelled = (char **) nmem_malloc(nmem, suggestions->num * sizeof(**suggestions->misspelled)); + suggestions->misspelled = (char **) + nmem_malloc(nmem, suggestions->num * sizeof(*suggestions->misspelled)); /* replace = with \0 .. for each item */ for (i = 0; i < suggestions->num; i++) { @@ -1638,11 +1723,6 @@ static void client_suggestions_destroy(struct client *cl) nmem_destroy(nmem); } -int client_test_sort_order(struct client *cl, struct reclist_sortparms *sp) -{ - //TODO implement correctly. - return 1; -} /* * Local variables: * c-basic-offset: 4