-/* $Id: client.c,v 1.16 2007-07-13 13:16:57 adam Exp $
+/* $Id: client.c,v 1.20 2007-09-10 16:25:50 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
char **databaselist;
Z_Query *zquery;
int ssub = 0, lslb = 100000, mspn = 10;
- char *piggyback = 0;
- char *queryenc = 0;
- yaz_iconv_t iconv = 0;
+ const char *piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK);
+ const char *queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING);
yaz_log(YLOG_DEBUG, "Sending search to %s", sdb->database->url);
client_get_pquery(cl));
// converting to target encoding
- 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,
for (ndb = 0; sdb->database->databases[ndb]; ndb++)
databaselist[ndb] = sdb->database->databases[ndb];
- if (!(piggyback = session_setting_oneval(sdb, PZ_PIGGYBACK))
- || *piggyback == '1')
+ if (!piggyback || *piggyback == '1')
{
const char *elements = session_setting_oneval(sdb, PZ_ELEMENTS);
const char *recsyn = session_setting_oneval(sdb, PZ_REQUESTSYNTAX);
continue;
}
if (rlist->num_records)
- 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);
#if USE_TIMING
yaz_timing_stop(t);
static void init_authentication(struct client *cl, Z_InitRequest *req)
{
struct session_database *sdb = client_get_database(cl);
- char *auth = session_setting_oneval(sdb, PZ_AUTHENTICATION);
+ const char *auth = session_setting_oneval(sdb, PZ_AUTHENTICATION);
if (*auth)
{
Z_IdAuthentication *idAuth = odr_malloc(global_parameters.odr_out,
sizeof(*idAuth));
idAuth->which = Z_IdAuthentication_open;
- idAuth->u.open = auth;
+ idAuth->u.open = odr_strdup(global_parameters.odr_out, 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;
- char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
-
+ const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
+
if (*zproxy)
yaz_oi_set_string_oid(&req->otherInfo,
global_parameters.odr_out,
if (!ccl_map)
return -1;
+
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);
- 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);
}
ccl_rpn_delete(cn);