ZOOM_resultset resultset;
YAZ_MUTEX mutex;
int ref_count;
- /* copy of database->url */
char *url;
};
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);
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);
connection_continue(co);
}
-struct client *client_create(void)
+struct client *client_create(const char *url)
{
struct client *cl = xmalloc(sizeof(*cl));
cl->maxrecs = 100;
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;
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
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;
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, "limit %s used, but no limitmap defined",
- name);
+ yaz_log(YLOG_WARN, "Target %s: limit %s used, but no limitmap defined",
+ (sdb->database ? sdb->database->url : "<no url>"), name);
}
}
+ nmem_destroy(nmem_tmp);
}
// Parse the query given the settings specific to this client
return 0;
}
-
Odr_int client_get_hits(struct client *cl)
{
return cl->hits;
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)