-/* $Id: client.c,v 1.17 2007-08-17 12:25:26 adam Exp $
+/* $Id: client.c,v 1.21 2007-09-19 13:00:01 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
void client_set_state(struct client *cl, enum client_state st)
{
cl->state = st;
+ if (cl->session)
+ {
+ int no_active = session_active_clients(cl->session);
+ if (no_active == 0)
+ session_alert_watch(cl->session, SESSION_WATCH_SHOW);
+ }
}
static void client_show_raw_error(struct client *cl, const char *addinfo);
client_show_raw_error(cl, "client connection failure");
yaz_log(YLOG_WARN, "Fatal error from %s", client_get_url(cl));
connection_destroy(cl->connection);
- cl->state = Client_Error;
+ client_set_state(cl, Client_Error);
}
char **databaselist;
Z_Query *zquery;
int ssub = 0, lslb = 100000, mspn = 10;
- char *piggyback = 0;
- char *queryenc = session_setting_oneval(sdb, PZ_QUERYENCODING);
+ 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);
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,
// 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);