From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 28 Apr 2010 12:58:58 +0000 (+0200)
Subject: Update for changed 3arg for yaz_cond_wait
X-Git-Tag: v1.4.0~6^2^2^2~2
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=cafa72a7f26ae7f3e0c0e2f6594302f370166a51;p=pazpar2-moved-to-github.git

Update for changed 3arg for yaz_cond_wait
---

diff --git a/src/client.h b/src/client.h
index 4d23481..f8d8a55 100644
--- a/src/client.h
+++ b/src/client.h
@@ -73,7 +73,7 @@ void client_disconnect(struct client *cl);
 int client_prep_connection(struct client *cl,
                            int operation_timeout, int session_timeout,
                            iochan_man_t iochan,
-                           const struct timespec *abstime);
+                           const struct timeval *abstime);
 void client_start_search(struct client *cl);
 void client_set_session(struct client *cl, struct session *se);
 int client_is_active(struct client *cl);
diff --git a/src/connection.c b/src/connection.c
index f95beb1..08d1501 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -451,7 +451,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
 int client_prep_connection(struct client *cl,
                            int operation_timeout, int session_timeout,
                            iochan_man_t iochan_man,
-                           const struct timespec *abstime)
+                           const struct timeval *abstime)
 {
     struct connection *co;
     struct host *host = client_get_host(cl);
diff --git a/src/session.c b/src/session.c
index 309d9ff..290c252 100644
--- a/src/session.c
+++ b/src/session.c
@@ -514,7 +514,6 @@ enum pazpar2_error_code search(struct session *se,
     int no_working = 0;
     int no_failed = 0;
     struct client_list *l;
-    struct timespec abstime;
     struct timeval tval;
 
     yaz_log(YLOG_DEBUG, "Search");
@@ -540,8 +539,7 @@ enum pazpar2_error_code search(struct session *se,
 
     gettimeofday(&tval, 0);
     
-    abstime.tv_sec = tval.tv_sec + 5;
-    abstime.tv_nsec = tval.tv_usec * 1000;
+    tval.tv_sec += 5;
 
     for (l = se->clients; l; l = l->next)
     {
@@ -561,7 +559,7 @@ enum pazpar2_error_code search(struct session *se,
             if (client_prep_connection(cl, se->service->z3950_operation_timeout,
                                        se->service->z3950_session_timeout,
                                        se->service->server->iochan_man,
-                                       &abstime))
+                                       &tval))
                 client_start_search(cl);
         }
     }