X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=357817314ffce59cb860647c961f225324d647e7;hb=f1200fd1cab4fa57feacd43046997ce2d23edbd5;hp=f80e302421781f14c445ca6113ae9e325a64ea50;hpb=3333bc7385d16bc0707c5b5a3b9e5a27fac35472;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index f80e302..3578173 100644 --- a/src/client.c +++ b/src/client.c @@ -412,16 +412,12 @@ static int nativesyntax_to_type(const char *s, char *type, const char *cp = strchr(s, ';'); yaz_snprintf(type, 80, "xml; charset=%s", cp ? cp+1 : "marc-8s"); } - else if (!strncmp(s, "xml", 3)) - { - 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 + else /* pass verbatim to ZOOM - including "xml" */ strcpy(type, s); return 0; } @@ -547,10 +543,10 @@ 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); + 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")); @@ -589,8 +585,7 @@ static void client_record_ingest(struct client *cl) else if (ZOOM_record_error(rec, &msg, &addinfo, 0)) { yaz_log(YLOG_WARN, "Record error %s (%s): %s (rec #%d)", - msg, addinfo, client_get_id(cl), - cl->record_offset); + msg, addinfo, client_get_id(cl), cl->record_offset); } else { @@ -696,7 +691,7 @@ static void client_set_facets_request(struct client *cl, ZOOM_connection link) wrbuf_puts(w, ","); } } - yaz_log(YLOG_LOG, "using facets str: %s", wrbuf_cstr(w)); + yaz_log(YLOG_DEBUG, "using facets str: %s", wrbuf_cstr(w)); ZOOM_connection_option_set(link, "facets", wrbuf_len(w) ? wrbuf_cstr(w) : 0); wrbuf_destroy(w); @@ -758,17 +753,17 @@ void client_start_search(struct client *cl) const char *opt_preferred = session_setting_oneval(sdb, PZ_PREFERRED); const char *extra_args = session_setting_oneval(sdb, PZ_EXTRA_ARGS); const char *opt_present_chunk = session_setting_oneval(sdb, PZ_PRESENT_CHUNK); - /* Default present chunk */ - int present_chunk = 20; + ZOOM_query q; + char maxrecs_str[24], startrecs_str[24], present_chunk_str[24]; + int present_chunk = 20; // Default chunk size if (opt_present_chunk && strcmp(opt_present_chunk,"")) { present_chunk = atoi(opt_present_chunk); + yaz_log(YLOG_DEBUG, "Present chunk set to %d", present_chunk); } - char maxrecs_str[24], startrecs_str[24], present_chunk_str[24]; - ZOOM_query q; - assert(link); cl->diagnostic = 0; + cl->filtered = 0; if (extra_args && *extra_args) ZOOM_connection_option_set(link, "extraArgs", extra_args); @@ -805,11 +800,13 @@ void client_start_search(struct client *cl) /* A present_chunk less than 1 will disable chunking. */ if (present_chunk > 0 && cl->maxrecs > present_chunk) { sprintf(present_chunk_str, "%d", present_chunk); - ZOOM_connection_option_set(link, "presentChunk", opt_present_chunk); + ZOOM_connection_option_set(link, "presentChunk", present_chunk_str); + yaz_log(YLOG_DEBUG, "Present chunk set to %s", present_chunk_str); } - else + else { ZOOM_connection_option_set(link, "presentChunk", maxrecs_str); - + yaz_log(YLOG_DEBUG, "Present chunk set to %s (maxrecs)", maxrecs_str); + } sprintf(startrecs_str, "%d", cl->startrecs); ZOOM_connection_option_set(link, "start", startrecs_str); @@ -820,15 +817,14 @@ void client_start_search(struct client *cl) q = ZOOM_query_create(); if (cl->cqlquery) { - yaz_log(YLOG_LOG, "Search %s 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(q, cl->cqlquery); if (*opt_sort) ZOOM_query_sortby(q, opt_sort); } else { - yaz_log(YLOG_LOG, "Search %s 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(q, cl->pquery); } @@ -837,6 +833,7 @@ void client_start_search(struct client *cl) const char *sort_strategy_and_spec = get_strategy_plus_sort(cl, se->sorted_results->field); int increasing = se->sorted_results->increasing; + int position = se->sorted_results->position; if (sort_strategy_and_spec && strlen(sort_strategy_and_spec) < 40) { char spec[50], *p; @@ -851,7 +848,7 @@ void client_start_search(struct client *cl) strcat(p, " <"); else strcat(p, " >"); - yaz_log(YLOG_LOG, "applying %s %s", spec, p); + yaz_log(YLOG_LOG, "Client %s: applying sorting %s %s", client_get_id(cl), spec, p); ZOOM_query_sortby2(q, spec, p); } } @@ -861,11 +858,13 @@ void client_start_search(struct client *cl) skip it entirely */ if (se->sorted_results->next) { + yaz_log(YLOG_DEBUG,"Client %s: Do not (re)search anyway", client_get_id(cl)); ZOOM_query_destroy(q); return; } } } + yaz_log(YLOG_DEBUG,"Client %s: Starting search", client_get_id(cl)); client_set_state(cl, Client_Working); cl->hits = 0; cl->record_offset = 0; @@ -981,7 +980,7 @@ void client_disconnect(struct client *cl) // Initialize CCL map for a target -static CCL_bibset prepare_cclmap(struct client *cl) +static CCL_bibset prepare_cclmap(struct client *cl, CCL_bibset base_bibset) { struct session_database *sdb = client_get_database(cl); struct setting *s; @@ -989,7 +988,10 @@ static CCL_bibset prepare_cclmap(struct client *cl) if (!sdb->settings) return 0; - res = ccl_qual_mk(); + if (base_bibset) + res = ccl_qual_dup(base_bibset); + else + res = ccl_qual_mk(); for (s = sdb->settings[PZ_CCLMAP]; s; s = s->next) { char *p = strchr(s->name + 3, ':'); @@ -1081,17 +1083,23 @@ 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, WRBUF w_ccl) + WRBUF w_pqf, WRBUF w_ccl, + CCL_bibset ccl_map) { int ret = 0; int i = 0; const char *name; const char *value; + const char **and_op_names = ccl_qual_search_special(ccl_map, "and"); + const char *and_op = and_op_names ? and_op_names[0] : "and"; + const char **or_op_names = ccl_qual_search_special(ccl_map, "or"); + const char *or_op = or_op_names ? or_op_names[0] : "or"; + NMEM nmem_tmp = nmem_create(); for (i = 0; (name = facet_limits_get(facet_limits, i, &value)); i++) { struct setting *s = 0; - + nmem_reset(nmem_tmp); for (s = sdb->settings[PZ_LIMITMAP]; s; s = s->next) { const char *p = strchr(s->name + 3, ':'); @@ -1120,13 +1128,13 @@ static int apply_limit(struct session_database *sdb, else if (!strncmp(s->value, "ccl:", 4)) { const char *ccl = s->value + 4; - - wrbuf_puts(w_ccl, " and ("); + + wrbuf_printf(w_ccl, " %s (", and_op); for (i = 0; i < num; i++) { if (i) - wrbuf_puts(w_ccl, " or "); + wrbuf_printf(w_ccl, " %s ", or_op); wrbuf_puts(w_ccl, ccl); wrbuf_puts(w_ccl, "=\""); wrbuf_puts(w_ccl, values[i]); @@ -1147,7 +1155,6 @@ static int apply_limit(struct session_database *sdb, break; } } - nmem_reset(nmem_tmp); if (!s) { yaz_log(YLOG_WARN, "Target %s: limit %s used, but no limitmap defined", @@ -1165,14 +1172,15 @@ static int apply_limit(struct session_database *sdb, // return -2 on limit error int client_parse_query(struct client *cl, const char *query, facet_limits_t facet_limits, - const char *startrecs, const char *maxrecs) + const char *startrecs, const char *maxrecs, + CCL_bibset bibset) { struct session *se = client_get_session(cl); 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); + CCL_bibset ccl_map = prepare_cclmap(cl, 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); @@ -1206,21 +1214,24 @@ int client_parse_query(struct client *cl, const char *query, wrbuf_puts(w_pqf, " "); } - if (apply_limit(sdb, facet_limits, w_pqf, w_ccl)) + if (apply_limit(sdb, facet_limits, w_pqf, w_ccl, ccl_map)) + { + ccl_qual_rm(&ccl_map); return -2; + } facet_limits_destroy(cl->facet_limits); cl->facet_limits = facet_limits_dup(facet_limits); - yaz_log(YLOG_LOG, "CCL query: %s", wrbuf_cstr(w_ccl)); + yaz_log(YLOG_LOG, "Client %s: CCL query: %s", client_get_id(cl), wrbuf_cstr(w_ccl)); cn = ccl_find_str(ccl_map, wrbuf_cstr(w_ccl), &cerror, &cpos); ccl_qual_rm(&ccl_map); if (!cn) { client_set_state(cl, Client_Error); - session_log(se, YLOG_WARN, "Failed to parse CCL query '%s' for %s", - wrbuf_cstr(w_ccl), - client_get_id(cl)); + session_log(se, YLOG_WARN, "Client %s: Failed to parse CCL query '%s'", + client_get_id(cl), + wrbuf_cstr(w_ccl)); wrbuf_destroy(w_ccl); wrbuf_destroy(w_pqf); return -1; @@ -1264,13 +1275,13 @@ int client_parse_query(struct client *cl, const char *query, if (!zquery) { - session_log(se, YLOG_WARN, "Invalid PQF query for %s: %s", + session_log(se, YLOG_WARN, "Invalid PQF query for Client %s: %s", client_get_id(cl), cl->pquery); ret_value = -1; } else { - session_log(se, YLOG_LOG, "PQF for %s: %s", + session_log(se, YLOG_LOG, "PQF for Client %s: %s", client_get_id(cl), cl->pquery); /* Support for PQF on SRU targets. */ @@ -1290,8 +1301,8 @@ int client_parse_query(struct client *cl, const char *query, if (!se->relevance) { // Initialize relevance structure with query terms - se->relevance = relevance_create_ccl( - se->service->charsets, se->nmem, cn); + se->relevance = relevance_create_ccl(se->service->charsets, cn, + se->service->rank_cluster); } ccl_rpn_delete(cn); return ret_value; @@ -1329,9 +1340,11 @@ Odr_int client_get_hits(struct client *cl) Odr_int client_get_approximation(struct client *cl) { - int records = cl->record_offset + cl->filtered; - if (records > 0) - return cl->hits * cl->record_offset / records; + 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; } @@ -1419,11 +1432,11 @@ struct suggestions* client_suggestions_create(const char* suggestions_string) int i; NMEM nmem; struct suggestions *suggestions; - if (suggestions_string == 0) + if (suggestions_string == 0 || suggestions_string[0] == 0 ) return 0; nmem = nmem_create(); suggestions = nmem_malloc(nmem, sizeof(*suggestions)); - yaz_log(YLOG_DEBUG, "client target suggestions: %s", suggestions_string); + yaz_log(YLOG_DEBUG, "client target suggestions: %s.", suggestions_string); suggestions->nmem = nmem; suggestions->num = 0;