X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=528fef4e6b30d4166bd06b64cd41e6c7da34022d;hb=142c8c510a7b23c633272c656e45277e4ec35d30;hp=55b376690182db9ad39b97f02669c88bc26d9af2;hpb=a79507492e2b925c9688e66ee9b718c3d6acd2e5;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 55b3766..528fef4 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -34,19 +34,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef WIN32
-#include <winsock.h>
-typedef int socklen_t;
-#endif
-#if HAVE_NETDB_H
-#include <netdb.h>
-#endif
 
 #include <signal.h>
-#include <ctype.h>
 #include <assert.h>
 
 #include <yaz/log.h>
@@ -72,8 +61,6 @@ struct connection {
     char *ibuf;
     int ibufsize;
     char *zproxy;
-    int set_id_request;
-    int set_id_response;
     enum {
         Conn_Resolving,
         Conn_Connecting,
@@ -94,9 +81,10 @@ static int connection_is_idle(struct connection *co)
     if (co->state != Conn_Open || !link)
         return 0;
 
+    if (!ZOOM_connection_is_idle(link))
+        return 0;
     event = ZOOM_connection_peek_event(link);
-    if (event == ZOOM_EVENT_NONE ||
-                event == ZOOM_EVENT_END)
+    if (event == ZOOM_EVENT_NONE || event == ZOOM_EVENT_END)
         return 1;
     else
         return 0;
@@ -116,7 +104,6 @@ void connection_set_resultset(struct connection *co, ZOOM_resultset rs)
 {
     if (co->resultset)
         ZOOM_resultset_destroy(co->resultset);
-    co->set_id_request++;
     co->resultset = rs;
 }
 
@@ -184,8 +171,6 @@ static struct connection *connection_create(struct client *cl)
     new->link = 0;
     new->resultset = 0;
     new->state = Conn_Resolving;
-    new->set_id_request = 0;
-    new->set_id_response = 0;
     if (host->ipport)
         connection_connect(new);
     return new;
@@ -203,11 +188,21 @@ static void non_block_events(struct connection *co)
         if (!r)
             break;
         ev = ZOOM_connection_last_event(link);
+#if 0
+        yaz_log(YLOG_LOG, "ZOOM_EVENT_%s", ZOOM_get_event_str(ev));
+#endif
         switch (ev) 
         {
         case ZOOM_EVENT_END:
-            if (co->set_id_request == co->set_id_response)
-                client_set_state(co->client, Client_Idle);
+            {
+                const char *error, *addinfo;
+                if (ZOOM_connection_error(link, &error, &addinfo))
+                {
+                    yaz_log(YLOG_LOG, "Error %s from %s",
+                            error, client_get_url(cl));
+                }
+                client_set_state(cl, Client_Idle);
+            }
             break;
         case ZOOM_EVENT_SEND_DATA:
             break;
@@ -223,17 +218,13 @@ static void non_block_events(struct connection *co)
         case ZOOM_EVENT_CONNECT:
             yaz_log(YLOG_LOG, "Connected to %s", client_get_url(cl));
             co->state = Conn_Open;
-            client_set_state(co->client, Client_Connected);
             iochan_settimeout(iochan, global_parameters.z3950_session_timeout);
             break;
         case ZOOM_EVENT_RECV_SEARCH:
-            co->set_id_response++;
-            if (co->set_id_request == co->set_id_response)
-                client_search_response(cl);
+            client_search_response(cl);
             break;
         case ZOOM_EVENT_RECV_RECORD:
-            if (co->set_id_request == co->set_id_response)
-                client_record_response(cl);
+            client_record_response(cl);
             break;
         default:
             yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
@@ -407,16 +398,7 @@ static int connection_connect(struct connection *con)
     if (sru && *sru)
         strcpy(ipport, "http://");
     strcat(ipport, host->ipport);
-    /* deal with SRU path here because databaseName option is not read in
-       ZOOM in SRU mode */
-    if (sru && *sru)
-    {
-        if (*sdb->database->databases[0])
-        {
-            strcat(ipport, "/");
-            strcat(ipport, sdb->database->databases[0]);
-        }
-    }
+
     ZOOM_connection_connect(link, ipport, 0);
     
     con->link = link;
@@ -478,14 +460,14 @@ int client_prep_connection(struct client *cl)
             connection_release(co);
             client_set_connection(cl, co);
             co->client = cl;
-#if 0
             /* tells ZOOM to reconnect if necessary. Disabled becuase
                the ZOOM_connection_connect flushes the task queue */
             ZOOM_connection_connect(co->link, 0, 0);
-#endif
         }
         else
+        {
             co = connection_create(cl);
+        }
     }
 
     if (co && co->link)