X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=6dce5d92e20e49cee0deeae69ac3e3925118c89a;hb=cc03aa93987775b58199f26c1429a661213bf5f4;hp=78aad616886117ce0b2fd7344a8378224c75d5aa;hpb=116eaa2065a4b4fec0dcc55985170e3364132995;p=pazpar2-moved-to-github.git

diff --git a/src/session.c b/src/session.c
index 78aad61..6dce5d9 100644
--- a/src/session.c
+++ b/src/session.c
@@ -648,12 +648,9 @@ void session_sort(struct session *se, const char *field, int increasing)
     for (l = se->clients_active; l; l = l->next)
     {
         struct client *cl = l->client;
-        struct timeval tval;
-        int ret = client_prep_connection(cl, se->service->z3950_operation_timeout,
-                                         se->service->z3950_session_timeout,
-                                         se->service->server->iochan_man,
-                                         &tval, 1);
-        if (ret)
+        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);
@@ -744,13 +741,13 @@ enum pazpar2_error_code session_search(struct session *se,
                 client_prep_connection(cl, se->service->z3950_operation_timeout,
                                        se->service->z3950_session_timeout,
                                        se->service->server->iochan_man,
-                                       &tval, 0);
+                                       &tval);
             if (parse_ret == 1 && r == 2)
             {
                 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);