X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-c.c;h=e8740648c7955755c5d3d9eed719ea529eab516b;hb=9cc8f4a4d0fd7f1e4bd6c9d5c85ef2dccaab5743;hp=8de6cd0e7dc8e9856dffbd80fb6d20f708c2e041;hpb=f213113a8a7f5d311d5dc60aafbd6bc49d76e3b1;p=yaz-moved-to-github.git

diff --git a/src/zoom-c.c b/src/zoom-c.c
index 8de6cd0..e874064 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zoom-c.c,v 1.38 2005-05-02 19:17:48 adam Exp $
+ * $Id: zoom-c.c,v 1.40 2005-05-02 19:33:55 adam Exp $
  */
 /**
  * \file zoom-c.c
@@ -355,10 +355,7 @@ ZOOM_connection_connect(ZOOM_connection c,
     xfree (c->charset);
     val = ZOOM_options_get (c->options, "charset");
     if (val && *val)
-    {
 	c->charset = xstrdup (val);
-	yaz_log(YLOG_LOG, "connect charset=%s", c->charset);
-    }
     else
 	c->charset = 0;
 
@@ -1018,7 +1015,7 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c)
 	ZOOM_options_get(c->options, "implementationName"),
 	odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName));
 
-    version = odr_strdup(c->odr_out, "$Revision: 1.38 $");
+    version = odr_strdup(c->odr_out, "$Revision: 1.40 $");
     if (strlen(version) > 10)	/* check for unexpanded CVS strings */
 	version[strlen(version)-2] = '\0';
     ireq->implementationVersion = odr_prepend(c->odr_out,
@@ -1983,8 +1980,6 @@ static void handle_records (ZOOM_connection c, Z_Records *sr,
 		Z_NamePlusRecord *myrec = 
 		    zget_surrogateDiagRec(resultset->odr, 0, 14, 0);
 		record_cache_add(resultset, myrec, resultset->start);
-		yaz_log(YLOG_LOG, "pseudo record 1, at pos %d",
-			resultset->start);
 	    }
 	}
 	else if (present_phase)
@@ -1993,8 +1988,6 @@ static void handle_records (ZOOM_connection c, Z_Records *sr,
 	    Z_NamePlusRecord *myrec = 
 		zget_surrogateDiagRec(resultset->odr, 0, 14, 0);
 	    record_cache_add(resultset, myrec, resultset->start);
-	    yaz_log(YLOG_LOG, "pseudo record 1, at pos %d",
-		    resultset->start);
 	}
     }
 }
@@ -3476,7 +3469,8 @@ ZOOM_connection_last_event(ZOOM_connection cs)
 ZOOM_API(int)
 ZOOM_event (int no, ZOOM_connection *cs)
 {
-    int timeout = 5000;
+    int timeout = 30;      /* default timeout in seconds */
+    int timeout_set = 0;   /* whether it was overriden at all */
 #if HAVE_SYS_POLL_H
     struct pollfd pollfds[1024];
     ZOOM_connection poll_cs[1024];
@@ -3533,10 +3527,18 @@ ZOOM_event (int no, ZOOM_connection *cs)
 	    continue;
 	if (max_fd < fd)
 	    max_fd = fd;
-
-        this_timeout = ZOOM_options_get_int (c->options, "timeout", -1);
-        if (this_timeout != -1 && this_timeout < timeout)
-            timeout = this_timeout;
+	
+	/* -1 is used for indefinite timeout (no timeout), so -2 here. */
+        this_timeout = ZOOM_options_get_int (c->options, "timeout", -2);
+	if (this_timeout != -2)
+	{
+	    /* ensure the minimum timeout is used */
+	    if (!timeout_set)
+		timeout = this_timeout;
+	    else if (this_timeout != -1 && this_timeout < timeout)
+		timeout = this_timeout;
+	    timeout_set = 1;
+	}		
 #if HAVE_SYS_POLL_H
         if (mask)
         {
@@ -3572,14 +3574,11 @@ ZOOM_event (int no, ZOOM_connection *cs)
 	}
 #endif
     }
-    if (timeout >= 5000)
-        timeout = 30;
-
     if (!nfds)
         return 0;
 
 #if HAVE_SYS_POLL_H
-    r = poll (pollfds, nfds, timeout * 1000);
+    r = poll (pollfds, nfds, (timeout == -1 ? -1 : timeout * 1000));
     for (i = 0; i<nfds; i++)
     {
         ZOOM_connection c = poll_cs[i];
@@ -3608,7 +3607,7 @@ ZOOM_event (int no, ZOOM_connection *cs)
     tv.tv_sec = timeout;
     tv.tv_usec = 0;
     yaz_log (log_level, "select start");
-    r = select (max_fd+1, &input, &output, &except, &tv);
+    r = select (max_fd+1, &input, &output, &except, (timeout == -1 ? 0 : &tv));
     yaz_log (log_level, "select stop, returned r=%d", r);
     for (i = 0; i<no; i++)
     {