X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=ba9bab4bf4771b99130a800b23f18d4d722a299c;hb=47468fed198c86bb88662873264bb6f432f101bf;hp=dcbfd6ce00fe5d06f6b028b1b0ffa43d13df920b;hpb=2f8b2679c4e4d7f482d726ebfee201035d6e3192;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index dcbfd6c..ba9bab4 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; } @@ -695,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); @@ -762,11 +758,12 @@ void client_start_search(struct client *cl) 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); } - assert(link); cl->diagnostic = 0; + cl->filtered = 0; if (extra_args && *extra_args) ZOOM_connection_option_set(link, "extraArgs", extra_args); @@ -803,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); @@ -979,7 +978,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; @@ -987,7 +986,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, ':'); @@ -1079,17 +1081,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, ':'); @@ -1118,13 +1126,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]); @@ -1145,7 +1153,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", @@ -1163,14 +1170,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); @@ -1204,8 +1212,11 @@ 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); @@ -1288,8 +1299,7 @@ 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); } ccl_rpn_delete(cn); return ret_value; @@ -1329,7 +1339,7 @@ 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_LOG, "%s: Approx: %lld * %d / %d = %lld ", client_get_id(cl), cl->hits, cl->record_offset - cl->filtered, cl->record_offset, approx); + 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 +1429,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;