X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=30ef0407b4b25f0c4b7cdd0d4791209d3382d70b;hb=5b6b18f35bb161eafa6f8a8bd0413a35ce637eff;hp=26dd6efa93c0ec7c320a8698159508f8a64f517c;hpb=a1076b95713b6417eaf4083631ba34a7532bd6dd;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 26dd6ef..30ef040 100644 --- a/src/client.c +++ b/src/client.c @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /** \file client.c - \brief Z39.50 client + \brief Z39.50 client */ #if HAVE_CONFIG_H @@ -286,7 +286,7 @@ int client_show_raw_begin(struct client *cl, int position, if (!cl->connection) return -1; - + rr = xmalloc(sizeof(*rr)); rr->position = position; @@ -306,13 +306,13 @@ int client_show_raw_begin(struct client *cl, int position, assert(nativesyntax); rr->nativesyntax = xstrdup(nativesyntax); - + rr->next = 0; - + for (rrp = &cl->show_raw; *rrp; rrp = &(*rrp)->next) ; *rrp = rr; - + if (cl->state == Client_Failed) { client_show_raw_error(cl, "client failed"); @@ -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; } @@ -537,7 +533,7 @@ void client_search_response(struct client *cl) ZOOM_resultset resultset = cl->resultset; const char *error, *addinfo = 0; - + if (ZOOM_connection_error(link, &error, &addinfo)) { cl->hits = 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 { @@ -598,7 +593,7 @@ static void client_record_ingest(struct client *cl) NMEM nmem = nmem_create(); const char *xmlrec; char type[80]; - + const char *s = session_setting_oneval(sdb, PZ_NATIVESYNTAX); if (nativesyntax_to_type(s, type, rec)) yaz_log(YLOG_WARN, "Failed to determine record type"); @@ -620,8 +615,7 @@ static void client_record_ingest(struct client *cl) } else { - yaz_log(YLOG_WARN, "Expected record, but got NULL, offset=%d", - offset); + yaz_log(YLOG_WARN, "Expected record, but got NULL, offset=%d", offset); } } @@ -678,7 +672,7 @@ static void client_set_facets_request(struct client *cl, ZOOM_connection link) struct session_database *sdb = client_get_database(cl); WRBUF w = wrbuf_alloc(); - + struct setting *s; for (s = sdb->settings[PZ_FACETMAP]; s; s = s->next) @@ -696,7 +690,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); @@ -722,7 +716,7 @@ static const char *get_strategy_plus_sort(struct client *l, const char *field) struct setting *s; const char *strategy_plus_sort = 0; - + for (s = sdb->settings[PZ_SORTMAP]; s; s = s->next) { char *p = strchr(s->name + 3, ':'); @@ -758,17 +752,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 query; + 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 +799,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); @@ -817,26 +813,26 @@ void client_start_search(struct client *cl) /* facets definition is in PQF */ client_set_facets_request(cl, link); - q = ZOOM_query_create(); + query = ZOOM_query_create(); if (cl->cqlquery) { - yaz_log(YLOG_LOG, "Search %s CQL: %s", client_get_id(cl), - cl->cqlquery); - ZOOM_query_cql(q, 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(q, opt_sort); + ZOOM_query_sortby(query, opt_sort); } else { - yaz_log(YLOG_LOG, "Search %s PQF: %s", client_get_id(cl), cl->pquery); - - ZOOM_query_prefix(q, cl->pquery); + yaz_log(YLOG_LOG, "Client %s: Search PQF: %s", client_get_id(cl), cl->pquery); + + ZOOM_query_prefix(query, cl->pquery); } if (se->sorted_results) { /* first entry is current sorting ! */ const char *sort_strategy_and_spec = - get_strategy_plus_sort(cl, se->sorted_results->field); + get_strategy_plus_sort(cl, se->sorted_results->name); int increasing = se->sorted_results->increasing; + // int position = se->sorted_results->type; if (sort_strategy_and_spec && strlen(sort_strategy_and_spec) < 40) { char spec[50], *p; @@ -851,26 +847,28 @@ void client_start_search(struct client *cl) strcat(p, " <"); else strcat(p, " >"); - yaz_log(YLOG_LOG, "applying %s %s", spec, p); - ZOOM_query_sortby2(q, spec, p); + yaz_log(YLOG_LOG, "Client %s: applying sorting %s %s", client_get_id(cl), spec, p); + ZOOM_query_sortby2(query, spec, p); } } else { - /* no native sorting.. If this is not the first search, then - skip it entirely */ + /* no native sorting.. If this is not the first search, then skip it entirely */ if (se->sorted_results->next) { - ZOOM_query_destroy(q); + // TODO this seems wrong. Need to re-ingest instead? + yaz_log(YLOG_DEBUG,"Client %s: Do not (re)search anyway", client_get_id(cl)); + ZOOM_query_destroy(query); 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; - rs = ZOOM_connection_search(link, q); - ZOOM_query_destroy(q); + rs = ZOOM_connection_search(link, query); + ZOOM_query_destroy(query); ZOOM_resultset_destroy(cl->resultset); cl->resultset = rs; connection_continue(co); @@ -903,7 +901,7 @@ struct client *client_create(const char *id) assert(id); cl->id = xstrdup(id); client_use(1); - + return cl; } @@ -981,7 +979,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,18 +987,39 @@ 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) { + const char *addinfo = 0; char *p = strchr(s->name + 3, ':'); if (!p) { - yaz_log(YLOG_WARN, "Malformed cclmap name: %s", s->name); + WRBUF w = wrbuf_alloc(); + wrbuf_printf(w, "Malformed cclmap. name=%s", s->name); + yaz_log(YLOG_WARN, "%s: %s", client_get_id(cl), wrbuf_cstr(w)); + client_set_diagnostic(cl, ZOOM_ERROR_CCL_CONFIG, wrbuf_cstr(w)); + client_set_state_nb(cl, Client_Error); ccl_qual_rm(&res); + wrbuf_destroy(w); return 0; } p++; - ccl_qual_fitem(res, s->value, p); + if (ccl_qual_fitem2(res, s->value, p, &addinfo)) + { + WRBUF w = wrbuf_alloc(); + + wrbuf_printf(w, "Malformed cclmap. name=%s: value=%s (%s)", + s->name, p, addinfo); + yaz_log(YLOG_WARN, "%s: %s", client_get_id(cl), wrbuf_cstr(w)); + client_set_diagnostic(cl, ZOOM_ERROR_CCL_CONFIG, wrbuf_cstr(w)); + client_set_state_nb(cl, Client_Error); + ccl_qual_rm(&res); + wrbuf_destroy(w); + return 0; + } } return res; } @@ -1020,7 +1039,7 @@ static char *make_cqlquery(struct client *cl, Z_RPNQuery *zquery) else { r = xstrdup(wrbuf_cstr(wrb)); - } + } wrbuf_destroy(wrb); cql_transform_close(cqlt); return r; @@ -1034,7 +1053,7 @@ static char *make_solrquery(struct client *cl, Z_RPNQuery *zquery) char *r = 0; WRBUF wrb = wrbuf_alloc(); int status; - + if ((status = solr_transform_rpn2solr_wrbuf(sqlt, wrb, zquery))) { yaz_log(YLOG_WARN, "Failed to generate SOLR query, code=%d", status); @@ -1058,7 +1077,7 @@ const char *client_get_facet_limit_local(struct client *cl, for (; (name = facet_limits_get(cl->facet_limits, *l, &value)); (*l)++) { struct setting *s = 0; - + for (s = sdb->settings[PZ_LIMITMAP]; s; s = s->next) { const char *p = strchr(s->name + 3, ':'); @@ -1068,7 +1087,7 @@ const char *client_get_facet_limit_local(struct client *cl, const char *cp = s->value + 6; while (*cp == ' ') cp++; - + nmem_strsplit_escape2(nmem, "|", value, values, num, 1, '\\', 1); (*l)++; @@ -1081,17 +1100,18 @@ 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, CCL_bibset ccl_map) { int ret = 0; int i = 0; const char *name; const char *value; + 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,20 +1140,34 @@ 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 ccl_w = wrbuf_alloc(); for (i = 0; i < num; i++) { - if (i) - wrbuf_puts(w_ccl, " or "); - wrbuf_puts(w_ccl, ccl); - wrbuf_puts(w_ccl, "=\""); - wrbuf_puts(w_ccl, values[i]); - wrbuf_puts(w_ccl, "\""); + int cerror, cpos; + struct ccl_rpn_node *cn; + + wrbuf_rewind(ccl_w); + wrbuf_puts(ccl_w, ccl); + wrbuf_puts(ccl_w, "=\""); + wrbuf_puts(ccl_w, values[i]); + wrbuf_puts(ccl_w, "\""); + + cn = ccl_find_str(ccl_map, wrbuf_cstr(ccl_w), + &cerror, &cpos); + if (cn) + { + if (i == 0) + wrbuf_printf(w_pqf, "@and "); + + /* or multiple values.. could be bad if last CCL + parse fails, but this is unlikely to happen */ + if (i < num - 1) + wrbuf_printf(w_pqf, "@or "); + ccl_pquery(w_pqf, cn); + ccl_rpn_delete(cn); + } } - wrbuf_puts(w_ccl, ")"); - + wrbuf_destroy(ccl_w); } else if (!strncmp(s->value, "local:", 6)) { /* no operation */ @@ -1147,7 +1181,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", @@ -1157,7 +1190,7 @@ static int apply_limit(struct session_database *sdb, nmem_destroy(nmem_tmp); return ret; } - + // Parse the query given the settings specific to this client // return 0 if query is OK but different from before // return 1 if query is OK but same as before @@ -1165,14 +1198,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); @@ -1182,7 +1216,7 @@ int client_parse_query(struct client *cl, const char *query, Z_RPNQuery *zquery; if (!ccl_map) - return -1; + return -3; if (maxrecs && atoi(maxrecs) != cl->maxrecs) { @@ -1206,21 +1240,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, 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; @@ -1255,24 +1292,24 @@ int client_parse_query(struct client *cl, const char *query, ret_value = 0; } wrbuf_destroy(w_pqf); - + xfree(cl->cqlquery); cl->cqlquery = 0; - odr_out = odr_createmem(ODR_ENCODE); + odr_out = odr_createmem(ODR_ENCODE); zquery = p_query_rpn(odr_out, cl->pquery); 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. */ if (strcmp(query_syntax, "pqf") != 0 && *sru) { @@ -1290,8 +1327,11 @@ 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, + se->service->rank_follow, + se->service->rank_lead, + se->service->rank_length); } ccl_rpn_delete(cn); return ret_value; @@ -1327,6 +1367,16 @@ Odr_int client_get_hits(struct client *cl) return cl->hits; } +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); + return approx; + } + return cl->hits; +} + int client_get_num_records(struct client *cl) { return cl->record_offset; @@ -1411,11 +1461,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; @@ -1447,6 +1497,11 @@ 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