char *id;
facet_limits_t facet_limits;
int same_search;
- char *sort_spec;
+ char *sort_strategy;
+ char *sort_criteria;
};
struct suggestions {
return 0;
}
+/*
+ * TODO consider how to extend the range
+ * */
int client_parse_range(struct client *cl, const char *startrecs, const char *maxrecs)
{
if (maxrecs && atoi(maxrecs) != cl->maxrecs)
cl->same_search = 0;
cl->startrecs = atoi(startrecs);
}
+
return 0;
}
int client_start_search(struct client *cl)
{
struct session_database *sdb = client_get_database(cl);
- struct connection *co = client_get_connection(cl);
- ZOOM_connection link = connection_get_link(co);
+ struct connection *co = 0;
+ ZOOM_connection link = 0;
struct session *se = client_get_session(cl);
ZOOM_resultset rs;
const char *opt_piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK);
present_chunk = atoi(opt_present_chunk);
yaz_log(YLOG_DEBUG, "Present chunk set to %d", present_chunk);
}
- assert(link);
rc_prep_connection =
client_prep_connection(cl, se->service->z3950_operation_timeout,
se->service->z3950_session_timeout,
session_log(se, YLOG_LOG, "client %s FAILED to search: No connection.", client_get_id(cl));
return -1;
}
+ co = client_get_connection(cl);
+ assert(cl);
+ link = connection_get_link(co);
+ assert(link);
+
session_log(se, YLOG_LOG, "client %s NEW search", client_get_id(cl));
cl->diagnostic = 0;
ZOOM_query_prefix(query, cl->pquery);
}
- // TODO check for re-ingest / re-search
+ if (cl->sort_strategy && cl->sort_criteria) {
+ yaz_log(YLOG_LOG, "Client %s: Setting ZOOM sort strategy and criteria: %s %s",
+ client_get_id(cl), cl->sort_strategy, cl->sort_criteria);
+ ZOOM_query_sortby2(query, cl->sort_strategy, cl->sort_criteria);
+ }
yaz_log(YLOG_DEBUG,"Client %s: Starting search", client_get_id(cl));
client_set_state(cl, Client_Working);
cl->preferred = 0;
cl->ref_count = 1;
cl->facet_limits = 0;
+ cl->sort_strategy = 0;
+ cl->sort_criteria = 0;
assert(id);
cl->id = xstrdup(id);
client_use(1);
}
// 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
+// client variable same_search is set as below as well as returned:
+// 0 if query is OK but different from before
+// 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_destroy(cl->facet_limits);
cl->facet_limits = facet_limits_dup(facet_limits);
- yaz_log(YLOG_LOG, "Client %s: CCL query: %s", client_get_id(cl), wrbuf_cstr(w_ccl));
+ yaz_log(YLOG_LOG, "Client %s: CCL query: %s limit: %s", client_get_id(cl), wrbuf_cstr(w_ccl), wrbuf_cstr(w_pqf));
cn = ccl_find_str(ccl_map, wrbuf_cstr(w_ccl), &cerror, &cpos);
ccl_qual_rm(&ccl_map);
if (!cn)
/* Compares query and limit with old one. If different we need to research */
if (!cl->pquery || strcmp(cl->pquery, wrbuf_cstr(w_pqf)))
{
+ if (cl->pquery)
+ session_log(se, YLOG_LOG, "Client %s: Re-search due query/limit change: %s to %s",
+ client_get_id(cl), cl->pquery, wrbuf_cstr(w_pqf));
xfree(cl->pquery);
cl->pquery = xstrdup(wrbuf_cstr(w_pqf));
+ // return value is no longer used.
ret_value = 0;
+ // Need to (re)search
+ cl->same_search= 0;
}
wrbuf_destroy(w_pqf);
cl->cqlquery = make_cqlquery(cl, zquery);
if (!cl->cqlquery)
ret_value = -1;
+ else
+ session_log(se, YLOG_LOG, "Client %s native query: %s (%s)",
+ client_get_id(cl), cl->cqlquery, sru);
}
}
odr_destroy(odr_out);
{
struct session *se = client_get_session(cl);
if (sp)
- { /* first entry is current sorting ! */
+ {
const char *sort_strategy_and_spec =
- get_strategy_plus_sort(cl, se->sorted_results->name);
-
- int increasing = se->sorted_results->increasing;
- // int type = se->sorted_results->type;
+ get_strategy_plus_sort(cl, sp->name);
+ int increasing = sp->increasing;
if (sort_strategy_and_spec && strlen(sort_strategy_and_spec) < 40)
{
- char spec[50], *p;
- strcpy(spec, sort_strategy_and_spec);
- p = strchr(spec, ':');
+ char strategy[50], *p;
+ strcpy(strategy, sort_strategy_and_spec);
+ p = strchr(strategy, ':');
if (p)
{
- *p++ = '\0'; /* cut the string in two */
+ // Split the string in two
+ *p++ = 0;
while (*p == ' ')
p++;
if (increasing)
strcat(p, " <");
else
strcat(p, " >");
- yaz_log(YLOG_LOG, "Client %s: applying sorting %s %s", client_get_id(cl), spec, p);
- if (!cl->sort_spec || strcmp(cl->sort_spec, spec))
+ yaz_log(YLOG_LOG, "Client %s: applying sorting %s %s", client_get_id(cl), strategy, p);
+ if (!cl->sort_strategy || strcmp(cl->sort_strategy, strategy))
+ cl->same_search = 0;
+ if (!cl->sort_criteria || strcmp(cl->sort_criteria, p))
cl->same_search = 0;
- cl->sort_spec = nmem_strdup(se->nmem, spec);
+ if (cl->same_search == 0) {
+ cl->sort_strategy = nmem_strdup(se->nmem, strategy);
+ cl->sort_criteria = nmem_strdup(se->nmem, p);
+ }
+ }
+ else {
+ yaz_log(YLOG_LOG, "Client %s: Invalid sort strategy and spec found %s", client_get_id(cl), sort_strategy_and_spec);
+ cl->sort_strategy = 0;
+ cl->sort_criteria = 0;
}
+ } else {
+ yaz_log(YLOG_LOG, "Client %s: No sort strategy and spec found.", client_get_id(cl));
+ cl->sort_strategy = 0;
+ cl->sort_criteria = 0;
}
+
}
- return 0;
+ return !cl->same_search;
}
void client_set_session(struct client *cl, struct session *se)
projects / pazpar2-moved-to-github.git / blobdiff