/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 Index Data
+ Copyright (C) Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
static YAZ_MUTEX g_mutex = 0;
static int no_clients = 0;
-static int no_clients_total = 0;
static int client_use(int delta)
{
yaz_mutex_create(&g_mutex);
yaz_mutex_enter(g_mutex);
no_clients += delta;
- if (delta > 0)
- no_clients_total += delta;
clients = no_clients;
yaz_mutex_leave(g_mutex);
yaz_log(YLOG_DEBUG, "%s clients=%d",
return client_use(0);
}
-int clients_count_total(void)
-{
- int total = 0;
- if (!g_mutex)
- return 0;
- yaz_mutex_enter(g_mutex);
- total = no_clients_total;
- yaz_mutex_leave(g_mutex);
- return total;
-}
-
-
/** \brief Represents client state for a connection to one search target */
struct client {
struct session_database *database;
struct session_database *sdb = client_get_database(cl);
const char *str;
int extend_recs = 0;
- int number;
+ int number = cl->hits - cl->record_offset;
str = session_setting_oneval(sdb, PZ_EXTENDRECS);
if (!str || !*str)
return 0;
yaz_log(YLOG_LOG, "cl=%s Trying to fetch more", client_get_id(cl));
- if (extend_recs > cl->hits)
- extend_recs = cl->hits;
-
- number = extend_recs - cl->record_offset;
+ if (number > extend_recs)
+ number = extend_recs;
if (number > 0)
{
ZOOM_resultset set = cl->resultset;
/* Nothing has changed and we already have a result */
if (cl->same_search == 1 && rc_prep_connection == 2)
{
- session_log(se, YLOG_LOG, "client %s REUSE result", client_get_id(cl));
+ session_log(se, YLOG_LOG, "client %s resuse result", client_get_id(cl));
return client_reingest(cl);
}
else if (!rc_prep_connection)
{
- session_log(se, YLOG_LOG, "client %s FAILED to search: No connection.", client_get_id(cl));
+ session_log(se, YLOG_LOG, "client %s postponing search: No connection",
+ client_get_id(cl));
+ client_set_state_nb(cl, Client_Working);
return -1;
}
co = client_get_connection(cl);
link = connection_get_link(co);
assert(link);
- session_log(se, YLOG_LOG, "client %s NEW search", client_get_id(cl));
+ session_log(se, YLOG_LOG, "client %s new search", client_get_id(cl));
cl->diagnostic = 0;
cl->filtered = 0;
cl->id = xstrdup(id);
client_use(1);
+ yaz_log(YLOG_DEBUG, "client_create c=%p %s", cl, id);
return cl;
}
// 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)
+ facet_limits_t facet_limits, const char **error_msg)
{
struct session *se = client_get_session(cl);
struct conf_service *service = se->service;
facet_limits_destroy(cl->facet_limits);
cl->facet_limits = facet_limits_dup(facet_limits);
- yaz_log(YLOG_LOG, "Client %s: CCL query: %s limit: %s", client_get_id(cl), wrbuf_cstr(w_ccl), wrbuf_cstr(w_pqf));
+ 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)
{
+ if (error_msg)
+ *error_msg = ccl_err_msg(cerror);
client_set_state(cl, Client_Error);
session_log(se, YLOG_WARN, "Client %s: Failed to parse CCL query '%s'",
client_get_id(cl),
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",
+ 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));
session_log(se, YLOG_WARN, "Invalid PQF query for Client %s: %s",
client_get_id(cl), cl->pquery);
ret_value = -1;
+ *error_msg = "Invalid PQF after CCL to PQF conversion";
}
else
{
else
cl->cqlquery = make_cqlquery(cl, zquery);
if (!cl->cqlquery)
+ {
+ *error_msg = "Cannot convert PQF to Solr/CQL";
ret_value = -1;
+ }
else
session_log(se, YLOG_LOG, "Client %s native query: %s (%s)",
client_get_id(cl), cl->cqlquery, sru);
const char *sort_strategy_and_spec =
get_strategy_plus_sort(cl, sp->name);
int increasing = sp->increasing;
+ if (!strcmp(sp->name, "relevance"))
+ increasing = 1;
if (sort_strategy_and_spec && strlen(sort_strategy_and_spec) < 40)
{
char strategy[50], *p;
&suggestions->num, 1, '\\', 0);
/* Set up misspelled array */
suggestions->misspelled = (char **)
- nmem_malloc(nmem, suggestions->num * sizeof(**suggestions->misspelled));
+ nmem_malloc(nmem, suggestions->num * sizeof(*suggestions->misspelled));
/* replace = with \0 .. for each item */
for (i = 0; i < suggestions->num; i++)
{