*/
/** \file client.c
- \brief Z39.50 client
+ \brief Z39.50 client
*/
#if HAVE_CONFIG_H
if (!cl->connection)
return -1;
-
+
rr = xmalloc(sizeof(*rr));
rr->position = 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");
ZOOM_resultset resultset = cl->resultset;
const char *error, *addinfo = 0;
-
+
if (ZOOM_connection_error(link, &error, &addinfo))
{
cl->hits = 0;
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");
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)
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, ':');
else
{
yaz_log(YLOG_LOG, "Client %s: Search PQF: %s", client_get_id(cl), cl->pquery);
-
+
ZOOM_query_prefix(q, cl->pquery);
}
if (se->sorted_results)
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;
+ // int position = se->sorted_results->position;
if (sort_strategy_and_spec && strlen(sort_strategy_and_spec) < 40)
{
char spec[50], *p;
assert(id);
cl->id = xstrdup(id);
client_use(1);
-
+
return cl;
}
else
{
r = xstrdup(wrbuf_cstr(wrb));
- }
+ }
wrbuf_destroy(wrb);
cql_transform_close(cqlt);
return r;
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);
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, ':');
const char *cp = s->value + 6;
while (*cp == ' ')
cp++;
-
+
nmem_strsplit_escape2(nmem, "|", value, values,
num, 1, '\\', 1);
(*l)++;
static int apply_limit(struct session_database *sdb,
facet_limits_t facet_limits,
- WRBUF w_pqf, WRBUF w_ccl,
- CCL_bibset ccl_map)
+ WRBUF w_pqf, 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++)
else if (!strncmp(s->value, "ccl:", 4))
{
const char *ccl = s->value + 4;
-
- wrbuf_printf(w_ccl, " %s (", and_op);
-
+ WRBUF ccl_w = wrbuf_alloc();
for (i = 0; i < num; i++)
{
- if (i)
- wrbuf_printf(w_ccl, " %s ", or_op);
- 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 */
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
wrbuf_puts(w_pqf, " ");
}
- if (apply_limit(sdb, facet_limits, w_pqf, w_ccl, ccl_map))
+ if (apply_limit(sdb, facet_limits, w_pqf, ccl_map))
{
ccl_qual_rm(&ccl_map);
return -2;
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_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)
{
{
// Initialize relevance structure with query terms
se->relevance = relevance_create_ccl(se->service->charsets, cn,
- se->service->rank_cluster);
+ se->service->rank_cluster,
+ se->service->rank_follow,
+ se->service->rank_lead,
+ se->service->rank_length);
}
ccl_rpn_delete(cn);
return ret_value;
projects / pazpar2-moved-to-github.git / blobdiff