int startrecs;
int diagnostic;
int preferred;
+ struct suggestions *suggestions;
enum client_state state;
struct show_raw *show_raw;
ZOOM_resultset resultset;
YAZ_MUTEX mutex;
int ref_count;
char *id;
+ facet_limits_t facet_limits;
+};
+
+struct suggestions {
+ NMEM nmem;
+ int num;
+ char **misspelled;
+ char **suggest;
+ char *passthrough;
};
struct show_raw {
return cl->state;
}
+void client_set_state_nb(struct client *cl, enum client_state st)
+{
+ cl->state = st;
+}
+
void client_set_state(struct client *cl, enum client_state st)
{
int was_active = 0;
}
+struct suggestions* client_suggestions_create(const char* suggestions_string);
+static void client_suggestions_destroy(struct client *cl);
+
void client_search_response(struct client *cl)
{
struct connection *co = cl->connection;
- struct session *se = cl->session;
ZOOM_connection link = connection_get_link(co);
ZOOM_resultset resultset = cl->resultset;
client_report_facets(cl, resultset);
cl->record_offset = cl->startrecs;
cl->hits = ZOOM_resultset_size(resultset);
- if (se) {
- se->total_hits += cl->hits;
- yaz_log(YLOG_DEBUG, "client_search_response: total hits "
- ODR_INT_PRINTF, se->total_hits);
- }
+ if (cl->suggestions)
+ client_suggestions_destroy(cl);
+ cl->suggestions = client_suggestions_create(ZOOM_resultset_option_get(resultset, "suggestions"));
}
}
}
}
+static void client_record_ingest(struct client *cl)
+{
+ const char *msg, *addinfo;
+ ZOOM_record rec = 0;
+ ZOOM_resultset resultset = cl->resultset;
+ int offset = cl->record_offset;
+ if ((rec = ZOOM_resultset_record(resultset, offset)))
+ {
+ cl->record_offset++;
+ if (cl->session == 0)
+ ;
+ 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);
+ }
+ else
+ {
+ struct session_database *sdb = client_get_database(cl);
+ NMEM nmem = nmem_create();
+ const char *xmlrec;
+ char type[80];
+
+ if (nativesyntax_to_type(sdb, type, rec))
+ yaz_log(YLOG_WARN, "Failed to determine record type");
+ xmlrec = ZOOM_record_get(rec, type, NULL);
+ if (!xmlrec)
+ yaz_log(YLOG_WARN, "ZOOM_record_get failed from %s",
+ client_get_id(cl));
+ else
+ {
+ /* OK = 0, -1 = failure, -2 = Filtered */
+ if (ingest_record(cl, xmlrec, cl->record_offset, nmem) == -1)
+ yaz_log(YLOG_WARN, "Failed to ingest from %s", client_get_id(cl));
+ }
+ nmem_destroy(nmem);
+ }
+ }
+ else
+ {
+ yaz_log(YLOG_WARN, "Expected record, but got NULL, offset=%d",
+ offset);
+ }
+}
+
void client_record_response(struct client *cl)
{
struct connection *co = cl->connection;
}
else
{
- ZOOM_record rec = 0;
- const char *msg, *addinfo;
-
if (cl->show_raw && cl->show_raw->active)
{
+ ZOOM_record rec = 0;
if ((rec = ZOOM_resultset_record(resultset,
cl->show_raw->position-1)))
{
}
else
{
- int offset = cl->record_offset;
- if ((rec = ZOOM_resultset_record(resultset, offset)))
- {
- cl->record_offset++;
- if (cl->session == 0)
- ;
- 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);
- }
- else
- {
- struct session_database *sdb = client_get_database(cl);
- NMEM nmem = nmem_create();
- const char *xmlrec;
- char type[80];
-
- if (nativesyntax_to_type(sdb, type, rec))
- yaz_log(YLOG_WARN, "Failed to determine record type");
- xmlrec = ZOOM_record_get(rec, type, NULL);
- if (!xmlrec)
- yaz_log(YLOG_WARN, "ZOOM_record_get failed from %s",
- client_get_id(cl));
- else
- {
- /* OK = 0, -1 = failure, -2 = Filtered */
- if (ingest_record(cl, xmlrec, cl->record_offset, nmem) == -1)
- yaz_log(YLOG_WARN, "Failed to ingest from %s", client_get_id(cl));
- }
- nmem_destroy(nmem);
- }
- }
- else
- {
- yaz_log(YLOG_WARN, "Expected record, but got NULL, offset=%d",
- offset);
- }
+ client_record_ingest(cl);
}
}
}
+void client_reingest(struct client *cl)
+{
+ int i = cl->startrecs;
+ int to = cl->record_offset;
+
+ cl->record_offset = i;
+ for (; i < to; i++)
+ client_record_ingest(cl);
+}
+
static void client_set_facets_request(struct client *cl, ZOOM_connection link)
{
struct session_database *sdb = client_get_database(cl);
return 0;
}
-void client_start_search(struct client *cl)
+void client_start_search(struct client *cl, const char *sort_strategy_and_spec,
+ int increasing)
{
struct session_database *sdb = client_get_database(cl);
struct connection *co = client_get_connection(cl);
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];
+ ZOOM_query q;
assert(link);
- cl->hits = -1;
+ cl->hits = 0;
cl->record_offset = 0;
cl->diagnostic = 0;
/* facets definition is in PQF */
client_set_facets_request(cl, link);
+ q = ZOOM_query_create();
if (cl->cqlquery)
{
- ZOOM_query q = ZOOM_query_create();
yaz_log(YLOG_LOG, "Search %s CQL: %s", client_get_id(cl),
cl->cqlquery);
ZOOM_query_cql(q, cl->cqlquery);
if (*opt_sort)
ZOOM_query_sortby(q, opt_sort);
- rs = ZOOM_connection_search(link, q);
- ZOOM_query_destroy(q);
}
else
{
yaz_log(YLOG_LOG, "Search %s PQF: %s", client_get_id(cl), cl->pquery);
- rs = ZOOM_connection_search_pqf(link, cl->pquery);
+
+ ZOOM_query_prefix(q, cl->pquery);
}
+ if (sort_strategy_and_spec &&
+ strlen(sort_strategy_and_spec) < 40 /* spec below */)
+ {
+ char spec[50], *p;
+ strcpy(spec, sort_strategy_and_spec);
+ p = strchr(spec, ':');
+ if (p)
+ {
+ *p++ = '\0'; /* cut the string in two */
+ while (*p == ' ')
+ p++;
+ if (increasing)
+ strcat(p, " <");
+ else
+ strcat(p, " >");
+ yaz_log(YLOG_LOG, "applying %s %s", spec, p);
+ ZOOM_query_sortby2(q, spec, p);
+ }
+ }
+ rs = ZOOM_connection_search(link, q);
+ ZOOM_query_destroy(q);
ZOOM_resultset_destroy(cl->resultset);
cl->resultset = rs;
connection_continue(co);
cl->state = Client_Disconnected;
cl->show_raw = 0;
cl->resultset = 0;
+ cl->suggestions = 0;
cl->mutex = 0;
pazpar2_mutex_create(&cl->mutex, "client");
cl->preferred = 0;
cl->ref_count = 1;
+ cl->facet_limits = 0;
assert(id);
cl->id = xstrdup(id);
client_use(1);
c->cqlquery = 0;
xfree(c->id);
assert(!c->connection);
+ facet_limits_destroy(c->facet_limits);
if (c->resultset)
{
return r;
}
-static void apply_limit(struct session_database *sdb,
- facet_limits_t facet_limits,
- WRBUF w_pqf, WRBUF w_ccl)
+const char *client_get_facet_limit_local(struct client *cl,
+ struct session_database *sdb,
+ int *l,
+ NMEM nmem, int *num, char ***values)
{
+ const char *name = 0;
+ const char *value = 0;
+ 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, ':');
+ if (p && !strcmp(p + 1, name) && s->value &&
+ !strncmp(s->value, "local:", 6))
+ {
+ nmem_strsplit_escape2(nmem, "|", value, values,
+ num, 1, '\\', 1);
+ (*l)++;
+ return name;
+ }
+ }
+ }
+ return 0;
+}
+
+static int apply_limit(struct session_database *sdb,
+ facet_limits_t facet_limits,
+ WRBUF w_pqf, WRBUF w_ccl)
+{
+ int ret = 0;
int i = 0;
const char *name;
const char *value;
wrbuf_puts(w_ccl, ")");
}
+ else if (!strncmp(s->value, "local:", 6))
+ ;
+ else
+ {
+ yaz_log(YLOG_WARN, "Target %s: Bad limitmap '%s'",
+ sdb->database->id, s->value);
+ ret = -1; /* bad limitmap */
+ }
break;
}
}
}
}
nmem_destroy(nmem_tmp);
+ return ret;
}
// Parse the query given the settings specific to this client
int client_parse_query(struct client *cl, const char *query,
- facet_limits_t facet_limits)
+ facet_limits_t facet_limits,
+ const char *startrecs, const char *maxrecs)
{
struct session *se = client_get_session(cl);
struct session_database *sdb = client_get_database(cl);
const char *pqf_strftime = session_setting_oneval(sdb, PZ_PQF_STRFTIME);
const char *query_syntax = session_setting_oneval(sdb, PZ_QUERY_SYNTAX);
WRBUF w_ccl, w_pqf;
+ int ret_value = 1;
+
if (!ccl_map)
return -1;
+
+ if (maxrecs && atoi(maxrecs) != cl->maxrecs)
+ {
+ ret_value = 0;
+ cl->maxrecs = atoi(maxrecs);
+ }
+
+ if (startrecs && atoi(startrecs) != cl->startrecs)
+ {
+ ret_value = 0;
+ cl->startrecs = atoi(startrecs);
+ }
+
w_ccl = wrbuf_alloc();
wrbuf_puts(w_ccl, query);
wrbuf_puts(w_pqf, " ");
}
- apply_limit(sdb, facet_limits, w_pqf, w_ccl);
+ if (apply_limit(sdb, facet_limits, w_pqf, w_ccl))
+ return -2;
+
+ facet_limits_destroy(cl->facet_limits);
+ cl->facet_limits = facet_limits_dup(facet_limits);
yaz_log(YLOG_LOG, "CCL query: %s", wrbuf_cstr(w_ccl));
cn = ccl_find_str(ccl_map, wrbuf_cstr(w_ccl), &cerror, &cpos);
wrbuf_putc(w_pqf, cp[0]);
}
}
- xfree(cl->pquery);
- cl->pquery = xstrdup(wrbuf_cstr(w_pqf));
+ if (!cl->pquery || strcmp(cl->pquery, wrbuf_cstr(w_pqf)))
+ {
+ xfree(cl->pquery);
+ cl->pquery = xstrdup(wrbuf_cstr(w_pqf));
+ ret_value = 0;
+ }
wrbuf_destroy(w_pqf);
yaz_log(YLOG_LOG, "PQF query: %s", cl->pquery);
}
ccl_rpn_delete(cn);
- return 0;
+ return ret_value;
}
void client_set_session(struct client *cl, struct session *se)
return cl->diagnostic;
}
+const char * client_get_suggestions_xml(struct client *cl, WRBUF wrbuf)
+{
+ /* int idx; */
+ struct suggestions *suggestions = cl->suggestions;
+
+ if (!suggestions) {
+ yaz_log(YLOG_DEBUG, "No suggestions found");
+ return "";
+ }
+ if (suggestions->passthrough) {
+ yaz_log(YLOG_DEBUG, "Passthrough Suggestions: \n%s\n", suggestions->passthrough);
+ return suggestions->passthrough;
+ }
+ if (suggestions->num == 0) {
+ return "";
+ }
+ /*
+ for (idx = 0; idx < suggestions->num; idx++) {
+ wrbuf_printf(wrbuf, "<suggest term=\"%s\"", suggestions->suggest[idx]);
+ if (suggestions->misspelled[idx] && suggestions->misspelled[idx]) {
+ wrbuf_puts(wrbuf, suggestions->misspelled[idx]);
+ wrbuf_puts(wrbuf, "</suggest>\n");
+ }
+ else
+ wrbuf_puts(wrbuf, "/>\n");
+ }
+ */
+ return wrbuf_cstr(wrbuf);
+}
+
+
void client_set_database(struct client *cl, struct session_database *db)
{
cl->database = db;
return cl->id;
}
-void client_set_maxrecs(struct client *cl, int v)
-{
- cl->maxrecs = v;
-}
-
int client_get_maxrecs(struct client *cl)
{
return cl->maxrecs;
}
-void client_set_startrecs(struct client *cl, int v)
+void client_set_preferred(struct client *cl, int v)
{
- cl->startrecs = v;
+ cl->preferred = v;
}
-void client_set_preferred(struct client *cl, int v)
+
+struct suggestions* client_suggestions_create(const char* suggestions_string)
{
- cl->preferred = v;
+ int i;
+ NMEM nmem;
+ struct suggestions *suggestions;
+ if (suggestions_string == 0)
+ return 0;
+ nmem = nmem_create();
+ suggestions = nmem_malloc(nmem, sizeof(*suggestions));
+ yaz_log(YLOG_DEBUG, "client target suggestions: %s", suggestions_string);
+
+ suggestions->nmem = nmem;
+ suggestions->num = 0;
+ suggestions->misspelled = 0;
+ suggestions->suggest = 0;
+ suggestions->passthrough = nmem_strdup_null(nmem, suggestions_string);
+
+ if (suggestions_string)
+ nmem_strsplit_escape2(suggestions->nmem, "\n", suggestions_string, &suggestions->suggest,
+ &suggestions->num, 1, '\\', 0);
+ /* Set up misspelled array */
+ suggestions->misspelled = (char **) nmem_malloc(nmem, suggestions->num * sizeof(**suggestions->misspelled));
+ /* replace = with \0 .. for each item */
+ for (i = 0; i < suggestions->num; i++)
+ {
+ char *cp = strchr(suggestions->suggest[i], '=');
+ if (cp) {
+ *cp = '\0';
+ suggestions->misspelled[i] = cp+1;
+ }
+ }
+ return suggestions;
}
+static void client_suggestions_destroy(struct client *cl)
+{
+ NMEM nmem = cl->suggestions->nmem;
+ cl->suggestions = 0;
+ nmem_destroy(nmem);
+}
/*
* Local variables:
projects / pazpar2-moved-to-github.git / blobdiff