/* This file is part of Pazpar2.
- Copyright (C) 2006-2011 Index Data
+ Copyright (C) 2006-2012 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
{
cl = client_create(db->database->id);
client_set_database(cl, db);
- client_set_session(cl, se);
l = xmalloc(sizeof(*l));
l->client = cl;
l->next = se->clients_cached;
se->clients_cached = l;
}
+ /* set session always. If may be 0 if client is not active */
+ client_set_session(cl, se);
l = xmalloc(sizeof(*l));
l->client = cl;
while (l)
{
struct client_list *l_next = l->next;
+
+ client_lock(l->client);
+ client_set_session(l->client, 0); /* mark client inactive */
+ client_unlock(l->client);
+
xfree(l);
l = l_next;
}
for (l = se->clients_active; l; l = l->next)
{
struct client *cl = l->client;
- struct timeval tval;
- if (client_prep_connection(cl, se->service->z3950_operation_timeout,
- se->service->z3950_session_timeout,
- se->service->server->iochan_man,
- &tval))
+ if (client_get_state(cl) == Client_Connecting ||
+ client_get_state(cl) == Client_Idle ||
+ client_get_state(cl) == Client_Working)
client_start_search(cl);
}
session_leave(se);
session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl));
client_reingest(cl);
}
- else
+ else if (r)
{
session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl));
client_start_search(cl);