X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=b6502737ba16508acbd41d9b98c47e06ad83445e;hb=44981e9f52420f6a42bb1ac55712f74a31d17020;hp=5bebb59424e7f90146dbb7dc76f785cf6690c680;hpb=3ae3cb006afc68eefad30f1a3f0674e58a74fe5f;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 5bebb59..b650273 100644 --- a/src/client.c +++ b/src/client.c @@ -119,7 +119,6 @@ struct client { ZOOM_resultset resultset; YAZ_MUTEX mutex; int ref_count; - /* copy of database->url */ char *url; }; @@ -671,7 +670,6 @@ void client_start_search(struct client *cl) struct connection *co = client_get_connection(cl); ZOOM_connection link = connection_get_link(co); ZOOM_resultset rs; - char *databaseName = sdb->database->databases[0]; const char *opt_piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK); const char *opt_queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING); const char *opt_elements = session_setting_oneval(sdb, PZ_ELEMENTS); @@ -695,7 +693,8 @@ void client_start_search(struct client *cl) if (opt_preferred) { cl->preferred = atoi(opt_preferred); if (cl->preferred) - yaz_log(YLOG_LOG, "Target %s has preferred status: %d", sdb->database->url, cl->preferred); + yaz_log(YLOG_LOG, "Target %s has preferred status: %d", + client_get_url(cl), cl->preferred); } client_set_state(cl, Client_Working); @@ -729,9 +728,6 @@ void client_start_search(struct client *cl) sprintf(startrecs_str, "%d", cl->startrecs); ZOOM_connection_option_set(link, "start", startrecs_str); - if (databaseName) - ZOOM_connection_option_set(link, "databaseName", databaseName); - /* TODO Verify does it break something for CQL targets(non-SOLR) ? */ /* facets definition is in PQF */ client_set_facets_request(cl, link); @@ -739,7 +735,8 @@ void client_start_search(struct client *cl) if (cl->cqlquery) { ZOOM_query q = ZOOM_query_create(); - yaz_log(YLOG_LOG, "Search %s CQL: %s", sdb->database->url, cl->cqlquery); + yaz_log(YLOG_LOG, "Search %s CQL: %s", client_get_url(cl), + cl->cqlquery); ZOOM_query_cql(q, cl->cqlquery); if (*opt_sort) ZOOM_query_sortby(q, opt_sort); @@ -748,7 +745,7 @@ void client_start_search(struct client *cl) } else { - yaz_log(YLOG_LOG, "Search %s PQF: %s", sdb->database->url, cl->pquery); + yaz_log(YLOG_LOG, "Search %s PQF: %s", client_get_url(cl), cl->pquery); rs = ZOOM_connection_search_pqf(link, cl->pquery); } ZOOM_resultset_destroy(cl->resultset); @@ -756,7 +753,7 @@ void client_start_search(struct client *cl) connection_continue(co); } -struct client *client_create(void) +struct client *client_create(const char *url) { struct client *cl = xmalloc(sizeof(*cl)); cl->maxrecs = 100; @@ -776,7 +773,8 @@ struct client *client_create(void) pazpar2_mutex_create(&cl->mutex, "client"); cl->preferred = 0; cl->ref_count = 1; - cl->url = 0; + assert(url); + cl->url = xstrdup(url); client_use(1); return cl; @@ -916,10 +914,14 @@ static char *make_solrquery(struct client *cl) ODR odr_out = odr_createmem(ODR_ENCODE); zquery = p_query_rpn(odr_out, cl->pquery); + if (zquery == 0) { + yaz_log(YLOG_WARN, "Failed to generate RPN from PQF: %s", cl->pquery); + return 0; + } yaz_log(YLOG_LOG, "PQF: %s", cl->pquery); if ((status = solr_transform_rpn2solr_wrbuf(sqlt, wrb, zquery))) { - yaz_log(YLOG_WARN, "Failed to generate SOLR query, code=%d", status); + yaz_log(YLOG_WARN, "Failed to generate SOLR query from PQF %s, code=%d", cl->pquery, status); r = 0; } else @@ -939,6 +941,7 @@ static void apply_limit(struct session_database *sdb, 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; @@ -948,32 +951,55 @@ static void apply_limit(struct session_database *sdb, const char *p = strchr(s->name + 3, ':'); if (p && !strcmp(p + 1, name) && s->value) { + char **values = 0; + int i, num = 0; + nmem_strsplit_escape2(nmem_tmp, "|", value, &values, + &num, 1, '\\', 1); + if (!strncmp(s->value, "rpn:", 4)) { const char *pqf = s->value + 4; + wrbuf_puts(w_pqf, "@and "); wrbuf_puts(w_pqf, pqf); wrbuf_puts(w_pqf, " "); - yaz_encode_pqf_term(w_pqf, value, strlen(value)); + for (i = 0; i < num; i++) + { + if (i < num - 1) + wrbuf_puts(w_pqf, "@or "); + yaz_encode_pqf_term(w_pqf, values[i], + strlen(values[i])); + } } else if (!strncmp(s->value, "ccl:", 4)) { const char *ccl = s->value + 4; - wrbuf_puts(w_ccl, " and "); - wrbuf_puts(w_ccl, ccl); - wrbuf_puts(w_ccl, "=\""); - wrbuf_puts(w_ccl, value); - wrbuf_puts(w_ccl, "\""); + + wrbuf_puts(w_ccl, " and ("); + + 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, "\""); + } + wrbuf_puts(w_ccl, ")"); + } break; } } + nmem_reset(nmem_tmp); if (!s) { yaz_log(YLOG_WARN, "Target %s: limit %s used, but no limitmap defined", - (sdb->database ? sdb->database->url : ""), name); + (sdb->database ? sdb->database->id : ""), name); } } + nmem_destroy(nmem_tmp); } // Parse the query given the settings specific to this client @@ -1013,7 +1039,7 @@ int client_parse_query(struct client *cl, const char *query, 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_database(cl)->database->url); + client_get_url(cl)); wrbuf_destroy(w_ccl); wrbuf_destroy(w_pqf); return -1; @@ -1102,7 +1128,6 @@ int client_is_active_preferred(struct client *cl) return 0; } - Odr_int client_get_hits(struct client *cl) { return cl->hits; @@ -1126,24 +1151,11 @@ int client_get_diagnostic(struct client *cl) void client_set_database(struct client *cl, struct session_database *db) { cl->database = db; - /* Copy the URL for safe logging even after session is gone */ - if (db) { - cl->url = xstrdup(db->database->url); - } -} - -struct host *client_get_host(struct client *cl) -{ - return client_get_database(cl)->database->host; } const char *client_get_url(struct client *cl) { - if (cl->url) - return cl->url; - else - /* This must not happen anymore, as the url is present until destruction of client */ - return "NOURL"; + return cl->url; } void client_set_maxrecs(struct client *cl, int v)