char *addinfo; // diagnostic info for most resent error
Odr_int hits;
int record_offset;
+ int filtered; // When using local:, this will count the number of filtered records.
int maxrecs;
int startrecs;
int diagnostic;
}
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"));
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
{
else
{
/* OK = 0, -1 = failure, -2 = Filtered */
- if (ingest_record(cl, xmlrec, cl->record_offset, nmem) == -1)
+ int rc = ingest_record(cl, xmlrec, cl->record_offset, nmem);
+ if (rc == -1)
yaz_log(YLOG_WARN, "Failed to ingest from %s", client_get_id(cl));
+ if (rc == -2)
+ cl->filtered += 1;
}
nmem_destroy(nmem);
}
{
int i = cl->startrecs;
int to = cl->record_offset;
+ cl->filtered = 0;
cl->record_offset = i;
for (; i < to; i++)
const char *opt_sort = session_setting_oneval(sdb, PZ_SORT);
const char *opt_preferred = session_setting_oneval(sdb, PZ_PREFERRED);
const char *extra_args = session_setting_oneval(sdb, PZ_EXTRA_ARGS);
- char maxrecs_str[24], startrecs_str[24];
+ const char *opt_present_chunk = session_setting_oneval(sdb, PZ_PRESENT_CHUNK);
ZOOM_query q;
+ 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);
+ }
assert(link);
sprintf(maxrecs_str, "%d", cl->maxrecs);
ZOOM_connection_option_set(link, "count", maxrecs_str);
- if (cl->maxrecs > 20)
- ZOOM_connection_option_set(link, "presentChunk", "20");
+ /* 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);
+ }
else
ZOOM_connection_option_set(link, "presentChunk", maxrecs_str);
cl->session = 0;
cl->hits = 0;
cl->record_offset = 0;
+ cl->filtered = 0;
cl->diagnostic = 0;
cl->state = Client_Disconnected;
cl->show_raw = 0;
}
// returns a xmalloced CQL query corresponding to the pquery in client
-static char *make_cqlquery(struct client *cl)
+static char *make_cqlquery(struct client *cl, Z_RPNQuery *zquery)
{
cql_transform_t cqlt = cql_transform_create();
- Z_RPNQuery *zquery;
- char *r;
+ char *r = 0;
WRBUF wrb = wrbuf_alloc();
int status;
- ODR odr_out = odr_createmem(ODR_ENCODE);
- zquery = p_query_rpn(odr_out, cl->pquery);
- yaz_log(YLOG_LOG, "PQF: %s", cl->pquery);
if ((status = cql_transform_rpn2cql_wrbuf(cqlt, wrb, zquery)))
{
yaz_log(YLOG_WARN, "Failed to generate CQL query, code=%d", status);
- r = 0;
}
else
{
r = xstrdup(wrbuf_cstr(wrb));
}
wrbuf_destroy(wrb);
- odr_destroy(odr_out);
cql_transform_close(cqlt);
return r;
}
// returns a xmalloced SOLR query corresponding to the pquery in client
// TODO Could prob. be merge with the similar make_cqlquery
-static char *make_solrquery(struct client *cl)
+static char *make_solrquery(struct client *cl, Z_RPNQuery *zquery)
{
solr_transform_t sqlt = solr_transform_create();
- Z_RPNQuery *zquery;
- char *r;
+ char *r = 0;
WRBUF wrb = wrbuf_alloc();
int status;
- 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 from PQF %s, code=%d", cl->pquery, status);
- r = 0;
+ yaz_log(YLOG_WARN, "Failed to generate SOLR query, code=%d", status);
}
else
{
r = xstrdup(wrbuf_cstr(wrb));
}
wrbuf_destroy(wrb);
- odr_destroy(odr_out);
solr_transform_close(sqlt);
return r;
}
}
// 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
+// return -1 on query error
+// 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)
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);
const char *sru = session_setting_oneval(sdb, PZ_SRU);
const char *pqf_prefix = session_setting_oneval(sdb, PZ_PQF_PREFIX);
const char *query_syntax = session_setting_oneval(sdb, PZ_QUERY_SYNTAX);
WRBUF w_ccl, w_pqf;
int ret_value = 1;
+ Z_RPNQuery *zquery;
if (!ccl_map)
return -1;
-
if (maxrecs && atoi(maxrecs) != cl->maxrecs)
{
ret_value = 0;
wrbuf_putc(w_pqf, cp[0]);
}
}
+
if (!cl->pquery || strcmp(cl->pquery, wrbuf_cstr(w_pqf)))
{
xfree(cl->pquery);
ret_value = 0;
}
wrbuf_destroy(w_pqf);
-
- yaz_log(YLOG_LOG, "PQF query: %s", cl->pquery);
-
+
xfree(cl->cqlquery);
+ cl->cqlquery = 0;
- /* Support for PQF on SRU targets. */
- /* TODO Refactor */
- yaz_log(YLOG_DEBUG, "Query syntax: %s", query_syntax);
- if (strcmp(query_syntax, "pqf") != 0 && *sru)
+ odr_out = odr_createmem(ODR_ENCODE);
+ zquery = p_query_rpn(odr_out, cl->pquery);
+ if (!zquery)
{
- if (!strcmp(sru, "solr")) {
- if (!(cl->cqlquery = make_solrquery(cl)))
- return -1;
- }
- else {
- if (!(cl->cqlquery = make_cqlquery(cl)))
- return -1;
- }
+
+ session_log(se, YLOG_WARN, "Invalid PQF query for %s: %s",
+ client_get_id(cl), cl->pquery);
+ ret_value = -1;
}
else
- cl->cqlquery = 0;
+ {
+ session_log(se, YLOG_LOG, "PQF for %s: %s",
+ client_get_id(cl), cl->pquery);
+
+ /* Support for PQF on SRU targets. */
+ if (strcmp(query_syntax, "pqf") != 0 && *sru)
+ {
+ if (!strcmp(sru, "solr"))
+ cl->cqlquery = make_solrquery(cl, zquery);
+ else
+ cl->cqlquery = make_cqlquery(cl, zquery);
+ if (!cl->cqlquery)
+ ret_value = -1;
+ }
+ }
+ odr_destroy(odr_out);
/* TODO FIX Not thread safe */
if (!se->relevance)
se->relevance = relevance_create_ccl(
se->service->charsets, se->nmem, cn);
}
-
ccl_rpn_delete(cn);
return ret_value;
}
return cl->hits;
}
+Odr_int client_get_approximation(struct client *cl)
+{
+ if (cl->record_offset > 0) {
+ Odr_int approx = (cl->hits * (cl->record_offset - cl->filtered)) / cl->record_offset;
+ 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);
+ return approx;
+ }
+ return cl->hits;
+}
+
int client_get_num_records(struct client *cl)
{
return cl->record_offset;
}
+int client_get_num_records_filtered(struct client *cl)
+{
+ return cl->filtered;
+}
+
void client_set_diagnostic(struct client *cl, int diagnostic,
const char *addinfo)
{