X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-c.c;h=65d14ab93bfe9d94e107abdc6a3fc35f2c6df030;hb=f6379872ace49628473c47d23b29e9f46b5afbe4;hp=2cb5bc9eb411fcf6e43f2c722ce93b5e2f29b80b;hpb=69d044abe3d3a3560267a16dc4db13386974d5e1;p=yaz-moved-to-github.git

diff --git a/src/zoom-c.c b/src/zoom-c.c
index 2cb5bc9..65d14ab 100644
--- a/src/zoom-c.c
+++ b/src/zoom-c.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2006, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: zoom-c.c,v 1.92 2006-10-05 14:58:58 adam Exp $
+ * $Id: zoom-c.c,v 1.101 2006-12-06 11:12:14 mike Exp $
  */
 /**
  * \file zoom-c.c
@@ -193,6 +193,33 @@ static void clear_error(ZOOM_connection c)
     }
 }
 
+void ZOOM_connection_show_task(ZOOM_task task)
+{
+    switch(task->which)
+    {
+    case ZOOM_TASK_SEARCH:
+        yaz_log(YLOG_LOG, "search p=%p", task);
+        break;
+    case ZOOM_TASK_RETRIEVE:
+        yaz_log(YLOG_LOG, "retrieve p=%p", task);
+        break;
+    case ZOOM_TASK_CONNECT:
+        yaz_log(YLOG_LOG, "connect p=%p", task);
+        break;
+    case ZOOM_TASK_SCAN:
+        yaz_log(YLOG_LOG, "scant p=%p", task);
+        break;
+    }
+}
+
+void ZOOM_connection_show_tasks(ZOOM_connection c)
+{
+    ZOOM_task task;
+    yaz_log(YLOG_LOG, "connection p=%p tasks", c);
+    for (task = c->tasks; task; task = task->next)
+        ZOOM_connection_show_task(task);
+}
+
 ZOOM_task ZOOM_connection_add_task(ZOOM_connection c, int which)
 {
     ZOOM_task *taskp = &c->tasks;
@@ -235,9 +262,13 @@ void ZOOM_connection_remove_task(ZOOM_connection c)
         {
         case ZOOM_TASK_SEARCH:
             ZOOM_resultset_destroy(task->u.search.resultset);
+            xfree(task->u.search.syntax);
+            xfree(task->u.search.elementSetName);
             break;
         case ZOOM_TASK_RETRIEVE:
             ZOOM_resultset_destroy(task->u.retrieve.resultset);
+            xfree(task->u.retrieve.syntax);
+            xfree(task->u.retrieve.elementSetName);
             break;
         case ZOOM_TASK_CONNECT:
             break;
@@ -272,7 +303,9 @@ void ZOOM_connection_remove_tasks(ZOOM_connection c)
         ZOOM_connection_remove_task(c);
 }
 
-static ZOOM_record record_cache_lookup(ZOOM_resultset r, int pos);
+static ZOOM_record record_cache_lookup(ZOOM_resultset r, int pos,
+                                       const char *syntax,
+                                       const char *elementSetName);
 
 ZOOM_API(ZOOM_connection)
     ZOOM_connection_create(ZOOM_options options)
@@ -326,7 +359,7 @@ ZOOM_API(ZOOM_connection)
 /* set database names. Take local databases (if set); otherwise
    take databases given in ZURL (if set); otherwise use Default */
 static char **set_DatabaseNames(ZOOM_connection con, ZOOM_options options,
-                                int *num)
+                                int *num, ODR odr)
 {
     char **databaseNames;
     const char *cp = ZOOM_options_get(options, "databaseName");
@@ -342,7 +375,7 @@ static char **set_DatabaseNames(ZOOM_connection con, ZOOM_options options,
     }
     if (!cp)
         cp = "Default";
-    nmem_strsplit(con->odr_out->mem, "+", cp,  &databaseNames, num);
+    nmem_strsplit(odr->mem, "+", cp,  &databaseNames, num);
     return databaseNames;
 }
 
@@ -420,9 +453,6 @@ ZOOM_API(void)
     else
         c->lang = 0;
 
-    val = ZOOM_options_get(c->options, "sru");
-    c->sru_mode = get_sru_mode_from_string(val);
-
     xfree(c->host_port);
     if (portnum)
     {
@@ -464,6 +494,9 @@ ZOOM_API(void)
         }
     }
 
+    val = ZOOM_options_get(c->options, "sru");
+    c->sru_mode = get_sru_mode_from_string(val);
+
     ZOOM_options_set(c->options, "host", c->host_port);
 
     val = ZOOM_options_get(c->options, "cookie");
@@ -704,6 +737,8 @@ ZOOM_resultset ZOOM_resultset_create(void)
     r->query = 0;
     r->connection = 0;
     r->next = 0;
+    r->databaseNames = 0;
+    r->num_databaseNames = 0;
     return r;
 }
 
@@ -727,6 +762,7 @@ ZOOM_API(ZOOM_resultset)
     ZOOM_task task;
     const char *cp;
     int start, count;
+    const char *syntax, *elementSetName;
 
     yaz_log(log_api, "%p ZOOM_connection_search set %p query %p", c, r, q);
     r->r_sort_spec = q->sort_spec;
@@ -749,6 +785,9 @@ ZOOM_API(ZOOM_resultset)
     cp = ZOOM_options_get(r->options, "schema");
     if (cp)
         r->schema = xstrdup(cp);
+
+    r->databaseNames = set_DatabaseNames(c, c->options, &r->num_databaseNames,
+                                         r->odr);
     
     r->connection = c;
 
@@ -773,7 +812,14 @@ ZOOM_API(ZOOM_resultset)
     task->u.search.resultset = r;
     task->u.search.start = start;
     task->u.search.count = count;
-    ZOOM_resultset_addref(r);  
+
+    syntax = ZOOM_options_get(r->options, "preferredRecordSyntax"); 
+    task->u.search.syntax = syntax ? xstrdup(syntax) : 0;
+    elementSetName = ZOOM_options_get(r->options, "elementSetName");
+    task->u.search.elementSetName = elementSetName 
+        ? xstrdup(elementSetName) : 0;
+   
+    ZOOM_resultset_addref(r);
 
     (q->refcount)++;
 
@@ -904,6 +950,8 @@ ZOOM_API(void)
 ZOOM_API(size_t)
     ZOOM_resultset_size(ZOOM_resultset r)
 {
+    yaz_log(log_details, "ZOOM_resultset_size r=%p count=%d",
+            r, r->size);
     return r->size;
 }
 
@@ -933,6 +981,7 @@ static void ZOOM_resultset_retrieve(ZOOM_resultset r,
     ZOOM_task task;
     ZOOM_connection c;
     const char *cp;
+    const char *syntax, *elementSetName;
 
     if (!r)
         return;
@@ -961,6 +1010,12 @@ static void ZOOM_resultset_retrieve(ZOOM_resultset r,
     task->u.retrieve.start = start;
     task->u.retrieve.count = count;
 
+    syntax = ZOOM_options_get(r->options, "preferredRecordSyntax"); 
+    task->u.retrieve.syntax = syntax ? xstrdup(syntax) : 0;
+    elementSetName = ZOOM_options_get(r->options, "elementSetName");
+    task->u.retrieve.elementSetName = elementSetName 
+        ? xstrdup(elementSetName) : 0;
+
     cp = ZOOM_options_get(r->options, "schema");
     if (cp)
     {
@@ -1221,7 +1276,7 @@ static zoom_ret ZOOM_connection_send_init(ZOOM_connection c)
                     odr_prepend(c->odr_out, "ZOOM-C",
                                 ireq->implementationName));
     
-    version = odr_strdup(c->odr_out, "$Revision: 1.92 $");
+    version = odr_strdup(c->odr_out, "$Revision: 1.101 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     ireq->implementationVersion = 
@@ -1344,16 +1399,16 @@ static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
     if (c->error)                  /* don't continue on error */
         return zoom_complete;
     assert(c->tasks);
-    if (c->tasks->which == ZOOM_TASK_SEARCH)
+    switch(c->tasks->which)
     {
+    case ZOOM_TASK_SEARCH:
         resultset = c->tasks->u.search.resultset;
         resultset->setname = xstrdup("default");
         ZOOM_options_set(resultset->options, "setname", resultset->setname);
         start = &c->tasks->u.search.start;
         count = &c->tasks->u.search.count;
-    }
-    else if (c->tasks->which == ZOOM_TASK_RETRIEVE)
-    {
+        break;
+    case ZOOM_TASK_RETRIEVE:
         resultset = c->tasks->u.retrieve.resultset;
 
         start = &c->tasks->u.retrieve.start;
@@ -1367,7 +1422,9 @@ static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
         for (i = 0; i < *count; i++)
         {
             ZOOM_record rec =
-                record_cache_lookup(resultset, i + *start);
+                record_cache_lookup(resultset, i + *start,
+                                    c->tasks->u.retrieve.syntax,
+                                    c->tasks->u.retrieve.elementSetName);
             if (!rec)
                 break;
             else
@@ -1381,6 +1438,9 @@ static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
 
         if (*count == 0)
             return zoom_complete;
+        break;
+    default:
+        return zoom_complete;
     }
     assert(resultset->query);
         
@@ -1466,11 +1526,11 @@ static zoom_ret ZOOM_connection_send_search(ZOOM_connection c)
         return zoom_complete;
     }
 
-    search_req->databaseNames =
-        set_DatabaseNames(c, r->options, &search_req->num_databaseNames);
+    search_req->databaseNames = r->databaseNames;
+    search_req->num_databaseNames = r->num_databaseNames;
 
     /* get syntax (no need to provide unless piggyback is in effect) */
-    syntax = ZOOM_options_get(r->options, "preferredRecordSyntax");
+    syntax = c->tasks->u.search.syntax;
 
     lslb = ZOOM_options_get_int(r->options, "largeSetLowerBound", -1);
     ssub = ZOOM_options_get_int(r->options, "smallSetUpperBound", -1);
@@ -1611,7 +1671,12 @@ ZOOM_API(ZOOM_record)
 ZOOM_API(ZOOM_record)
     ZOOM_resultset_record_immediate(ZOOM_resultset s,size_t pos)
 {
-    return record_cache_lookup(s, pos);
+    const char *syntax =
+        ZOOM_options_get(s->options, "preferredRecordSyntax"); 
+    const char *elementSetName =
+        ZOOM_options_get(s->options, "elementSetName");
+
+    return record_cache_lookup(s, pos, syntax, elementSetName);
 }
 
 ZOOM_API(ZOOM_record)
@@ -1771,6 +1836,53 @@ static const char *record_iconv_return(ZOOM_record rec, int *len,
     return buf;
 }
 
+ZOOM_API(int)
+    ZOOM_record_error(ZOOM_record rec, const char **cp,
+                      const char **addinfo, const char **diagset)
+{
+    Z_NamePlusRecord *npr;
+    
+    if (!rec)
+        return 0;
+    npr = rec->npr;
+    if (npr && npr->which == Z_NamePlusRecord_surrogateDiagnostic)
+    {
+        Z_DiagRec *diag_rec = npr->u.surrogateDiagnostic;
+        int error = YAZ_BIB1_UNSPECIFIED_ERROR;
+        const char *add = 0;
+
+        if (diag_rec->which == Z_DiagRec_defaultFormat)
+        {
+            Z_DefaultDiagFormat *ddf = diag_rec->u.defaultFormat;
+            int oclass;
+    
+            error = *ddf->condition;
+            switch (ddf->which)
+            {
+            case Z_DefaultDiagFormat_v2Addinfo:
+                add = ddf->u.v2Addinfo;
+                break;
+            case Z_DefaultDiagFormat_v3Addinfo:
+                add = ddf->u.v3Addinfo;
+                break;
+            }
+            if (diagset)
+                *diagset = yaz_z3950oid_to_str(ddf->diagnosticSetId, &oclass);
+        }
+        else
+        {
+            if (diagset)
+                *diagset = "Bib-1";
+        }
+        if (addinfo)
+            *addinfo = add ? add : "";
+        if (cp)
+            *cp = diagbib1_str(error);
+        return error;
+    }
+    return 0;
+}
+
 ZOOM_API(const char *)
     ZOOM_record_get(ZOOM_record rec, const char *type_spec, int *len)
 {
@@ -2026,13 +2138,10 @@ static size_t record_hash(int pos)
 }
 
 static void record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr, 
-                             int pos)
+                             int pos,
+                             const char *syntax, const char *elementSetName)
 {
     ZOOM_record_cache rc;
-    const char *elementSetName =
-        ZOOM_resultset_option_get(r, "elementSetName");
-    const char *syntax = 
-        ZOOM_resultset_option_get(r, "preferredRecordSyntax");
     
     ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD);
     ZOOM_connection_put_event(r->connection, event);
@@ -2079,13 +2188,11 @@ static void record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr,
     r->record_hash[record_hash(pos)] = rc;
 }
 
-static ZOOM_record record_cache_lookup(ZOOM_resultset r, int pos)
+static ZOOM_record record_cache_lookup(ZOOM_resultset r, int pos,
+                                       const char *syntax,
+                                       const char *elementSetName)
 {
     ZOOM_record_cache rc;
-    const char *elementSetName =
-        ZOOM_resultset_option_get(r, "elementSetName");
-    const char *syntax = 
-        ZOOM_resultset_option_get(r, "preferredRecordSyntax");
     
     for (rc = r->record_hash[record_hash(pos)]; rc; rc = rc->next)
     {
@@ -2108,6 +2215,7 @@ static void handle_records(ZOOM_connection c, Z_Records *sr,
 {
     ZOOM_resultset resultset;
     int *start, *count;
+    const char *syntax = 0, *elementSetName = 0;
 
     if (!c->tasks)
         return ;
@@ -2117,11 +2225,15 @@ static void handle_records(ZOOM_connection c, Z_Records *sr,
         resultset = c->tasks->u.search.resultset;
         start = &c->tasks->u.search.start;
         count = &c->tasks->u.search.count;
+        syntax = c->tasks->u.search.syntax;
+        elementSetName = c->tasks->u.search.elementSetName;
         break;
     case ZOOM_TASK_RETRIEVE:
         resultset = c->tasks->u.retrieve.resultset;        
         start = &c->tasks->u.retrieve.start;
         count = &c->tasks->u.retrieve.count;
+        syntax = c->tasks->u.retrieve.syntax;
+        elementSetName = c->tasks->u.retrieve.elementSetName;
         break;
     default:
         return;
@@ -2149,7 +2261,8 @@ static void handle_records(ZOOM_connection c, Z_Records *sr,
                 sr->u.databaseOrSurDiagnostics;
             for (i = 0; i<p->num_records; i++)
             {
-                record_cache_add(resultset, p->records[i], i + *start);
+                record_cache_add(resultset, p->records[i], i + *start,
+                                 syntax, elementSetName);
             }
             *count -= i;
             *start += i;
@@ -2165,7 +2278,8 @@ static void handle_records(ZOOM_connection c, Z_Records *sr,
                 /* present response and we didn't get any records! */
                 Z_NamePlusRecord *myrec = 
                     zget_surrogateDiagRec(resultset->odr, 0, 14, 0);
-                record_cache_add(resultset, myrec, *start);
+                record_cache_add(resultset, myrec, *start,
+                                 syntax, elementSetName);
             }
         }
         else if (present_phase)
@@ -2173,7 +2287,7 @@ static void handle_records(ZOOM_connection c, Z_Records *sr,
             /* present response and we didn't get any records! */
             Z_NamePlusRecord *myrec = 
                 zget_surrogateDiagRec(resultset->odr, 0, 14, 0);
-            record_cache_add(resultset, myrec, *start);
+            record_cache_add(resultset, myrec, *start, syntax, elementSetName);
         }
     }
 }
@@ -2385,20 +2499,15 @@ static zoom_ret send_present(ZOOM_connection c)
         resultset = c->tasks->u.search.resultset;
         start = &c->tasks->u.search.start;
         count = &c->tasks->u.search.count;
+        syntax = c->tasks->u.search.syntax;
+        elementSetName = c->tasks->u.search.elementSetName;
         break;
     case ZOOM_TASK_RETRIEVE:
         resultset = c->tasks->u.retrieve.resultset;
         start = &c->tasks->u.retrieve.start;
         count = &c->tasks->u.retrieve.count;
-
-        if (*start >= resultset->size)
-        {
-            yaz_log(log_details, "%p send_present start=%d >= size=%d",
-                    c, *start, resultset->size);
-            return zoom_complete;
-        }
-        if (*start + *count > resultset->size)
-            *count = resultset->size - *start;
+        syntax = c->tasks->u.retrieve.syntax;
+        elementSetName = c->tasks->u.retrieve.elementSetName;
         break;
     default:
         return zoom_complete;
@@ -2406,20 +2515,20 @@ static zoom_ret send_present(ZOOM_connection c)
     yaz_log(log_details, "%p send_present start=%d count=%d",
             c, *start, *count);
 
-    syntax = ZOOM_resultset_option_get(resultset, "preferredRecordSyntax");
-    elementSetName = ZOOM_resultset_option_get(resultset, "elementSetName");
-
+    if (*start < 0 || *count < 0 || *start + *count > resultset->size)
+    {
+        set_dset_error(c, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, "Bib-1",
+                       "", 0);
+    }
     if (c->error)                  /* don't continue on error */
         return zoom_complete;
-    if (*start < 0)
-        return zoom_complete;
     yaz_log(log_details, "send_present resultset=%p start=%d count=%d",
             resultset, *start, *count);
 
     for (i = 0; i < *count; i++)
     {
         ZOOM_record rec =
-            record_cache_lookup(resultset, i + *start);
+            record_cache_lookup(resultset, i + *start, syntax, elementSetName);
         if (!rec)
             break;
         else
@@ -2564,7 +2673,7 @@ ZOOM_API(ZOOM_scanset)
                 c, q, q->query_string);
         abort();
     }
-
+    
     scan = (ZOOM_scanset) xmalloc(sizeof(*scan));
     scan->connection = c;
     scan->odr = odr_createmem(ODR_DECODE);
@@ -2574,6 +2683,10 @@ ZOOM_API(ZOOM_scanset)
     scan->termListAndStartPoint =
         p_query_scan(scan->odr, PROTO_Z3950, &scan->attributeSet, start);
     xfree(freeme);
+
+    scan->databaseNames = set_DatabaseNames(c, c->options,
+                                            &scan->num_databaseNames,
+                                            scan->odr);
     if (scan->termListAndStartPoint != 0)
     {
         ZOOM_task task = ZOOM_connection_add_task(c, ZOOM_TASK_SCAN);
@@ -2648,8 +2761,8 @@ static zoom_ret send_scan(ZOOM_connection c)
         odr_intdup(c->odr_out,
                    ZOOM_options_get_int(scan->options, "stepSize", 0));
     
-    req->databaseNames = set_DatabaseNames(c, scan->options, 
-                                           &req->num_databaseNames);
+    req->databaseNames = scan->databaseNames;
+    req->num_databaseNames = scan->num_databaseNames;
 
     return send_APDU(c, apdu);
 }
@@ -2886,7 +2999,8 @@ Z_APDU *create_admin_package(ZOOM_package p, int type,
         Z_External *r = (Z_External *) odr_malloc(p->odr_out, sizeof(*r));
         const char *first_db = "Default";
         int num_db;
-        char **db = set_DatabaseNames(p->connection, p->options, &num_db);
+        char **db = set_DatabaseNames(p->connection, p->options, &num_db,
+                                      p->odr_out);
         if (num_db > 0)
             first_db = db[0];
             
@@ -2952,7 +3066,7 @@ static Z_APDU *create_update_package(ZOOM_package p)
     Z_APDU *apdu = 0;
     const char *first_db = "Default";
     int num_db;
-    char **db = set_DatabaseNames(p->connection, p->options, &num_db);
+    char **db = set_DatabaseNames(p->connection, p->options, &num_db, p->odr_out);
     const char *action = ZOOM_options_get(p->options, "action");
     const char *recordIdOpaque = ZOOM_options_get(p->options, "recordIdOpaque");
     const char *recordIdNumber = ZOOM_options_get(p->options, "recordIdNumber");
@@ -3322,6 +3436,16 @@ static void interpret_otherinformation_field(ZOOM_connection c,
     }
 }
 
+
+static void set_init_option(const char *name, void *clientData) {
+    ZOOM_connection c = clientData;
+    char buf[80];
+
+    sprintf(buf, "init_opt_%.70s", name);
+    ZOOM_connection_option_set(c, buf, "1");
+}
+
+
 static void recv_apdu(ZOOM_connection c, Z_APDU *apdu)
 {
     Z_InitResponse *initrs;
@@ -3352,6 +3476,10 @@ static void recv_apdu(ZOOM_connection c, Z_APDU *apdu)
         ZOOM_connection_option_set(c, "targetImplementationVersion",
                                    initrs->implementationVersion ?
                                    initrs->implementationVersion : "");
+
+        /* Make initrs->options available as ZOOM-level options */
+        yaz_init_opt_decode(initrs->options, set_init_option, (void*) c);
+
         if (!*initrs->result)
         {
             Z_External *uif = initrs->userInformationField;
@@ -3462,23 +3590,28 @@ static void handle_srw_response(ZOOM_connection c,
     NMEM nmem;
     ZOOM_Event event;
     int *start;
+    const char *syntax, *elementSetName;
 
     if (!c->tasks)
         return;
 
-    if (c->tasks->which == ZOOM_TASK_SEARCH)
+    switch(c->tasks->which)
     {
+    case ZOOM_TASK_SEARCH:
         resultset = c->tasks->u.search.resultset;
         start = &c->tasks->u.search.start;
-    }
-    else if (c->tasks->which == ZOOM_TASK_RETRIEVE)
-    {
+        syntax = c->tasks->u.search.syntax;
+        elementSetName = c->tasks->u.search.elementSetName;        
+        break;
+    case ZOOM_TASK_RETRIEVE:
         resultset = c->tasks->u.retrieve.resultset;
         start = &c->tasks->u.retrieve.start;
+        syntax = c->tasks->u.retrieve.syntax;
+        elementSetName = c->tasks->u.retrieve.elementSetName;
+        break;
+    default:
+        return;
     }
-    else
-        return ;
-
     event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH);
     ZOOM_connection_put_event(c, event);
 
@@ -3518,7 +3651,7 @@ static void handle_srw_response(ZOOM_connection c,
         npr->u.databaseRecord->u.octet_aligned->len = 
             npr->u.databaseRecord->u.octet_aligned->size = 
             res->records[i].recordData_len;
-        record_cache_add(resultset, npr, pos);
+        record_cache_add(resultset, npr, pos, syntax, elementSetName);
     }
     if (res->num_diagnostics > 0)
     {
@@ -3956,10 +4089,17 @@ ZOOM_API(int)
     int max_fd = 0;
 
     yaz_log(log_details, "ZOOM_event(no=%d,cs=%p)", no, cs);
+    
     for (i = 0; i<no; i++)
     {
         ZOOM_connection c = cs[i];
         ZOOM_Event event;
+
+#if 0
+        if (c)
+            ZOOM_connection_show_tasks(c);
+#endif
+
         if (c && (event = ZOOM_connection_get_event(c)))
         {
             ZOOM_Event_destroy(event);
@@ -4054,7 +4194,14 @@ ZOOM_API(int)
         return 0;
 
 #if HAVE_SYS_POLL_H
-    r = poll(pollfds, nfds, (timeout == -1 ? -1 : timeout * 1000));
+    while ((r = poll(pollfds, nfds,
+         (timeout == -1 ? -1 : timeout * 1000))) < 0
+          && errno == EINTR)
+    {
+        ;
+    }
+    if (r < 0)
+        yaz_log(YLOG_WARN|YLOG_ERRNO, "ZOOM_event: poll");
     for (i = 0; i<nfds; i++)
     {
         ZOOM_connection c = poll_cs[i];
@@ -4082,6 +4229,15 @@ ZOOM_API(int)
 #else
     tv.tv_sec = timeout;
     tv.tv_usec = 0;
+
+    while ((r = select(max_fd+1, &input, &output, &except,
+                       (timeout == -1 ? 0 : &tv))) < 0 && errno == EINTR)
+    {
+        ;
+    }
+    if (r < 0)
+        yaz_log(YLOG_WARN|YLOG_ERRNO, "ZOOM_event: select");
+
     r = select(max_fd+1, &input, &output, &except, (timeout == -1 ? 0 : &tv));
     for (i = 0; i<no; i++)
     {