Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
client_show_raw_error(cl, "client connection failure");
yaz_log(YLOG_WARN, "Fatal error from %s", client_get_url(cl));
connection_destroy(cl->connection);
client_show_raw_error(cl, "client connection failure");
yaz_log(YLOG_WARN, "Fatal error from %s", client_get_url(cl));
connection_destroy(cl->connection);
- if (cl->state == Client_Failed || cl->state == Client_Disconnected)
+ if (cl->state == Client_Failed)
+ {
+ client_show_raw_error(cl, "client failed");
+ }
+ else if (cl->state == Client_Disconnected)
- if ((queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING))){
- iconv = yaz_iconv_open(queryenc, "UTF-8");
+ if (queryenc && *queryenc)
+ {
+ yaz_iconv_t iconv = yaz_iconv_open(queryenc, "UTF-8");
if (iconv){
yaz_query_charset_convert_rpnquery(zquery->u.type_1,
global_parameters.odr_out,
if (iconv){
yaz_query_charset_convert_rpnquery(zquery->u.type_1,
global_parameters.odr_out,
for (ndb = 0; sdb->database->databases[ndb]; ndb++)
databaselist[ndb] = sdb->database->databases[ndb];
for (ndb = 0; sdb->database->databases[ndb]; ndb++)
databaselist[ndb] = sdb->database->databases[ndb];
{
const char *elements = session_setting_oneval(sdb, PZ_ELEMENTS);
const char *recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX);
{
const char *elements = session_setting_oneval(sdb, PZ_ELEMENTS);
const char *recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX);
- session_alert_watch(s, SESSION_WATCH_RECORDS);
+ session_alert_watch(s, SESSION_WATCH_SHOW);
+ if (rlist->num_records)
+ session_alert_watch(s, SESSION_WATCH_RECORD);
- se->total_hits += cl->hits;
+ if (cl->hits < 0)
+ {
+ yaz_log(YLOG_WARN, "Target %s returns hit count %d",
+ cl->database->database->url, cl->hits);
+ }
+ else
+ se->total_hits += cl->hits;
if (r->presentStatus && !*r->presentStatus && r->records)
{
yaz_log(YLOG_DEBUG, "Records in search response %s",
cl->database->database->url);
ingest_records(cl, r->records);
}
if (r->presentStatus && !*r->presentStatus && r->records)
{
yaz_log(YLOG_DEBUG, "Records in search response %s",
cl->database->database->url);
ingest_records(cl, r->records);
}
static void init_authentication(struct client *cl, Z_InitRequest *req)
{
struct session_database *sdb = client_get_database(cl);
static void init_authentication(struct client *cl, Z_InitRequest *req)
{
struct session_database *sdb = client_get_database(cl);
Z_IdAuthentication *idAuth = odr_malloc(global_parameters.odr_out,
sizeof(*idAuth));
idAuth->which = Z_IdAuthentication_open;
Z_IdAuthentication *idAuth = odr_malloc(global_parameters.odr_out,
sizeof(*idAuth));
idAuth->which = Z_IdAuthentication_open;
req->idAuthentication = idAuth;
connection_set_authentication(co, nmem_strdup(se->session_nmem, auth));
}
req->idAuthentication = idAuth;
connection_set_authentication(co, nmem_strdup(se->session_nmem, auth));
}
struct session_database *sdb = client_get_database(cl);
char *ztarget = sdb->database->url;
//char *ztarget = sdb->url;
struct session_database *sdb = client_get_database(cl);
char *ztarget = sdb->database->url;
//char *ztarget = sdb->url;
if (*zproxy)
yaz_oi_set_string_oid(&req->otherInfo,
global_parameters.odr_out,
if (*zproxy)
yaz_oi_set_string_oid(&req->otherInfo,
global_parameters.odr_out,
cn = ccl_find_str(ccl_map, query, &cerror, &cpos);
ccl_qual_rm(&ccl_map);
if (!cn)
cn = ccl_find_str(ccl_map, query, &cerror, &cpos);
ccl_qual_rm(&ccl_map);
if (!cn)
// Initialize relevance structure with query terms
char *p[512];
extract_terms(se->nmem, cn, p);
// Initialize relevance structure with query terms
char *p[512];
extract_terms(se->nmem, cn, p);
- se->relevance = relevance_create(client_get_database(cl)->pct,
- se->nmem, (const char **) p,
- se->expected_maxrecs);
+ se->relevance = relevance_create(
+ global_parameters.server->relevance_pct,
+ se->nmem, (const char **) p,
+ se->expected_maxrecs);
cl->state == Client_Initializing ||
cl->state == Client_Searching ||
cl->state == Client_Presenting))
cl->state == Client_Initializing ||
cl->state == Client_Searching ||
cl->state == Client_Presenting))