Enabled basic SRU support -- no CQL yet

[pazpar2-moved-to-github.git] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 11de6b2..e66ee72 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -133,6 +133,14 @@ static void remove_connection_from_host(struct connection *con)
     assert(*conp == 0);
 }
 
+void connection_continue(struct connection *co)
+{
+#if 1
+    yaz_log(YLOG_LOG, "connection_continue");
+    iochan_setevent(co->iochan, EVENT_OUTPUT);
+#endif
+}
+
 // Close connection and recycle structure
 void connection_destroy(struct connection *co)
 {
@@ -221,44 +229,45 @@ static void connection_handler(IOCHAN i, int event)
 
         if (ZOOM_event(1, &link))
         {
-            do {
+            do
+            {
                 int event = ZOOM_connection_last_event(link);
                 switch (event) 
                 {
-                    case ZOOM_EVENT_END:
-                        break;
-                    case ZOOM_EVENT_SEND_DATA:
-                        break;
-                    case ZOOM_EVENT_RECV_DATA:
-                        break;
-                    case ZOOM_EVENT_UNKNOWN:
-                        break;
-                    case ZOOM_EVENT_SEND_APDU:
-                        client_set_state(co->client, Client_Working);
-                        break;
-                    case ZOOM_EVENT_RECV_APDU:
-                        client_set_state(co->client, Client_Idle);
-                        break;
-                    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(i, global_parameters.z3950_session_timeout);
-                        break;
-                    case ZOOM_EVENT_RECV_SEARCH:
-                        yaz_log(YLOG_LOG, "Search response from %s", client_get_url(cl));
-                        client_search_response(cl);
-                        break;
-                    case ZOOM_EVENT_RECV_RECORD:
-                        yaz_log(YLOG_LOG, "Record from %s", client_get_url(cl));
-                        client_record_response(cl);
-                        break;
-                    default:
-                        yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
+                case ZOOM_EVENT_END:
+                    break;
+                case ZOOM_EVENT_SEND_DATA:
+                    break;
+                case ZOOM_EVENT_RECV_DATA:
+                    break;
+                case ZOOM_EVENT_UNKNOWN:
+                    break;
+                case ZOOM_EVENT_SEND_APDU:
+                    client_set_state(co->client, Client_Working);
+                    break;
+                case ZOOM_EVENT_RECV_APDU:
+                    client_set_state(co->client, Client_Idle);
+                    break;
+                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(i, global_parameters.z3950_session_timeout);
+                    break;
+                case ZOOM_EVENT_RECV_SEARCH:
+                    yaz_log(YLOG_LOG, "Search response from %s", client_get_url(cl));
+                    client_search_response(cl);
+                    break;
+                case ZOOM_EVENT_RECV_RECORD:
+                    yaz_log(YLOG_LOG, "Record from %s", client_get_url(cl));
+                    client_record_response(cl);
+                    break;
+                default:
+                    yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
                             event, client_get_url(cl));
                 }
             }
-            while(ZOOM_event_nonblock(1, &link));
+            while (ZOOM_event_nonblock(1, &link));
         }
     }
 }
@@ -343,9 +352,12 @@ int connection_connect(struct connection *con)
     struct host *host = connection_get_host(con);
     ZOOM_options zoptions = ZOOM_options_create();
     char *auth;
+    char *sru;
+    char ipport[512] = "";
 
     struct session_database *sdb = client_get_database(con->client);
     const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
+    const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
 
     assert(host->ipport);
     assert(con);
@@ -355,15 +367,18 @@ int connection_connect(struct connection *con)
             global_parameters.implementationName);
     ZOOM_options_set(zoptions, "implementationVersion",
             global_parameters.implementationVersion);
-
     if (zproxy && *zproxy)
     {
         con->zproxy = xstrdup(zproxy);
         ZOOM_options_set(zoptions, "proxy", zproxy);
     }
+    if (apdulog && *apdulog)
+        ZOOM_options_set(zoptions, "apdulog", apdulog);
 
     if ((auth = (char*) session_setting_oneval(sdb, PZ_AUTHENTICATION)))
         ZOOM_options_set(zoptions, "user", auth);
+    if ((sru = (char*) session_setting_oneval(sdb, PZ_SRU)) && *sru)
+        ZOOM_options_set(zoptions, "sru", sru);
 
     if (!(link = ZOOM_connection_create(zoptions)))
     {
@@ -371,7 +386,12 @@ int connection_connect(struct connection *con)
         ZOOM_options_destroy(zoptions);
         return -1;
     }
-    ZOOM_connection_connect(link, host->ipport, 0);
+
+    if (sru && *sru)
+        strcpy(ipport, "http://");
+    strcat(ipport, host->ipport);
+
+    ZOOM_connection_connect(link, ipport, 0);
     
     con->link = link;
     con->iochan = iochan_create(0, connection_handler, 0);