X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zutil%2Fzoom-c.c;h=82c7c3e942e81ad3c06504d5b06025850989a06f;hp=a414e45abdeeffe64c472f6b5552726e5d81d7c2;hb=5f9dfb9266ab741d41a636249a39a254e4fb7211;hpb=c620a713f1418315efcd4e6fab225e036775d365

diff --git a/zutil/zoom-c.c b/zutil/zoom-c.c
index a414e45..82c7c3e 100644
--- a/zutil/zoom-c.c
+++ b/zutil/zoom-c.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: zoom-c.c,v 1.17 2003-02-12 15:06:44 adam Exp $
+ * $Id: zoom-c.c,v 1.28 2003-02-23 14:26:58 adam Exp $
  *
  * ZOOM layer for C, connections, result sets, queries.
  */
@@ -10,6 +10,7 @@
 #include <string.h>
 #include "zoom-p.h"
 
+#include <yaz/yaz-util.h>
 #include <yaz/xmalloc.h>
 #include <yaz/otherinfo.h>
 #include <yaz/log.h>
@@ -18,7 +19,7 @@
 #include <yaz/diagbib1.h>
 #include <yaz/charneg.h>
 #include <yaz/ill.h>
-
+#include <yaz/srw.h>
 
 #if HAVE_SYS_POLL_H
 #include <sys/poll.h>
@@ -81,23 +82,40 @@ static ZOOM_Event ZOOM_connection_get_event(ZOOM_connection c)
     return event;
 }
 
-static void set_bib1_error (ZOOM_connection c, int error)
+
+static void set_dset_error (ZOOM_connection c, int error,
+                            const char *dset,
+                            const char *addinfo, const char *addinfo2)
 {
     xfree (c->addinfo);
     c->addinfo = 0;
     c->error = error;
-    c->diagset = "Bib-1";
+    c->diagset = dset;
+    if (addinfo && addinfo2)
+    {
+        c->addinfo = xmalloc(strlen(addinfo) + strlen(addinfo2) + 2);
+        strcpy(c->addinfo, addinfo);
+        strcat(c->addinfo, addinfo2);
+    }
+    else if (addinfo)
+        c->addinfo = xstrdup(addinfo);
+    if (error)
+        yaz_log(LOG_DEBUG, "Error %s %s:%d %s %s",
+                c->host_port ? c->host_port : "<>", dset, error,
+                addinfo ? addinfo : "",
+                addinfo2 ? addinfo2 : "");
+}
+
+static void set_HTTP_error (ZOOM_connection c, int error,
+                            const char *addinfo, const char *addinfo2)
+{
+    set_dset_error(c, error, "HTTP", addinfo, addinfo2);
 }
 
 static void set_ZOOM_error (ZOOM_connection c, int error,
 		            const char *addinfo)
 {
-    xfree (c->addinfo);
-    c->addinfo = 0;
-    c->error = error;
-    c->diagset = "ZOOM";
-    if (addinfo)
-        c->addinfo = xstrdup(addinfo);
+    set_dset_error(c, error, "ZOOM", addinfo, 0);
 }
 
 static void clear_error (ZOOM_connection c)
@@ -174,6 +192,8 @@ void ZOOM_connection_remove_task (ZOOM_connection c)
     }
 }
 
+static int ZOOM_connection_exec_task (ZOOM_connection c);
+
 void ZOOM_connection_remove_tasks (ZOOM_connection c)
 {
     while (c->tasks)
@@ -187,7 +207,7 @@ ZOOM_connection_create (ZOOM_options options)
 {
     ZOOM_connection c = (ZOOM_connection) xmalloc (sizeof(*c));
 
-    c->soap = 0;
+    c->proto = PROTO_Z3950;
     c->cs = 0;
     c->mask = 0;
     c->reconnect_ok = 0;
@@ -203,6 +223,7 @@ ZOOM_connection_create (ZOOM_options options)
     c->options = ZOOM_options_create_with_parent(options);
 
     c->host_port = 0;
+    c->path = 0;
     c->proxy = 0;
     
     c->charset = c->lang = 0;
@@ -367,6 +388,7 @@ ZOOM_query_create(void)
     s->z_query = 0;
     s->sort_spec = 0;
     s->odr = odr_createmem (ODR_ENCODE);
+    s->query_string = 0;
 
     return s;
 }
@@ -389,6 +411,7 @@ ZOOM_query_destroy(ZOOM_query s)
 ZOOM_API(int)
 ZOOM_query_prefix(ZOOM_query s, const char *str)
 {
+    s->query_string = odr_strdup(s->odr, str);
     s->z_query = (Z_Query *) odr_malloc (s->odr, sizeof(*s->z_query));
     s->z_query->which = Z_Query_type_1;
     s->z_query->u.type_1 =  p_query_rpn(s->odr, PROTO_Z3950, str);
@@ -402,16 +425,19 @@ ZOOM_query_cql(ZOOM_query s, const char *str)
 {
     Z_External *ext;
 
+    s->query_string = odr_strdup(s->odr, str);
+
     ext = (Z_External *) odr_malloc(s->odr, sizeof(*ext));
     ext->direct_reference = odr_getoidbystr(s->odr, "1.2.840.10003.16.2");
     ext->indirect_reference = 0;
     ext->descriptor = 0;
     ext->which = Z_External_CQL;
-    ext->u.cql = odr_strdup(s->odr, str);
+    ext->u.cql = s->query_string;
     
     s->z_query = (Z_Query *) odr_malloc (s->odr, sizeof(*s->z_query));
     s->z_query->which = Z_Query_type_104;
     s->z_query->u.type_104 =  ext;
+
     return 0;
 }
 
@@ -432,10 +458,6 @@ ZOOM_connection_destroy(ZOOM_connection c)
     ZOOM_resultset r;
     if (!c)
 	return;
-#if HAVE_GSOAP
-    if (c->soap)
-        soap_end(c->soap);
-#endif
     if (c->cs)
 	cs_close (c->cs);
     for (r = c->resultsets; r; r = r->next)
@@ -448,6 +470,7 @@ ZOOM_connection_destroy(ZOOM_connection c)
     ZOOM_options_destroy (c->options);
     ZOOM_connection_remove_tasks (c);
     xfree (c->host_port);
+    xfree (c->path);
     xfree (c->proxy);
     xfree (c->charset);
     xfree (c->lang);
@@ -477,11 +500,11 @@ ZOOM_resultset ZOOM_resultset_create ()
     r->start = 0;
     r->piggyback = 1;
     r->setname = 0;
+    r->schema = 0;
     r->count = 0;
     r->record_cache = 0;
     r->r_sort_spec = 0;
-    r->z_query = 0;
-    r->search = 0;
+    r->query = 0;
     r->connection = 0;
     r->next = 0;
     return r;
@@ -508,8 +531,7 @@ ZOOM_connection_search(ZOOM_connection c, ZOOM_query q)
     const char *cp;
 
     r->r_sort_spec = q->sort_spec;
-    r->z_query = q->z_query;
-    r->search = q;
+    r->query = q;
 
     r->options = ZOOM_options_create_with_parent(c->options);
 
@@ -518,13 +540,30 @@ ZOOM_connection_search(ZOOM_connection c, ZOOM_query q)
     r->piggyback = ZOOM_options_get_bool (r->options, "piggyback", 1);
     cp = ZOOM_options_get (r->options, "setname");
     if (cp)
-        r->setname = xstrdup (cp);
+        r->setname = xstrdup(cp);
+    cp = ZOOM_options_get (r->options, "schema");
+    if (cp)
+        r->schema = xstrdup(cp);
     
     r->connection = c;
 
     r->next = c->resultsets;
     c->resultsets = r;
 
+    if (c->host_port && c->proto == PROTO_HTTP)
+    {
+        if (!c->cs)
+        {
+            yaz_log(LOG_DEBUG, "NO COMSTACK");
+            ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT);
+        }
+        else
+        {
+            yaz_log(LOG_DEBUG, "PREPARE FOR RECONNECT");
+            c->reconnect_ok = 1;
+        }
+    }
+
     task = ZOOM_connection_add_task (c, ZOOM_TASK_SEARCH);
     task->u.search.resultset = r;
     ZOOM_resultset_addref (r);  
@@ -569,10 +608,11 @@ ZOOM_resultset_destroy(ZOOM_resultset r)
 		rp = &(*rp)->next;
 	    }
 	}
-	ZOOM_query_destroy (r->search);
+	ZOOM_query_destroy (r->query);
 	ZOOM_options_destroy (r->options);
 	odr_destroy (r->odr);
         xfree (r->setname);
+        xfree (r->schema);
 	xfree (r);
     }
 }
@@ -597,17 +637,42 @@ static void ZOOM_resultset_retrieve (ZOOM_resultset r,
 {
     ZOOM_task task;
     ZOOM_connection c;
+    const char *cp;
 
     if (!r)
 	return;
     c = r->connection;
     if (!c)
 	return;
+
+    if (c->host_port && c->proto == PROTO_HTTP)
+    {
+        if (!c->cs)
+        {
+            yaz_log(LOG_DEBUG, "NO COMSTACK");
+            ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT);
+        }
+        else
+        {
+            yaz_log(LOG_DEBUG, "PREPARE FOR RECONNECT");
+            c->reconnect_ok = 1;
+        }
+    }
     task = ZOOM_connection_add_task (c, ZOOM_TASK_RETRIEVE);
     task->u.retrieve.resultset = r;
     task->u.retrieve.start = start;
     task->u.retrieve.count = count;
 
+    cp = ZOOM_options_get (r->options, "schema");
+    if (cp)
+    {
+        if (!r->schema || strcmp(r->schema, cp))
+        {
+            xfree(r->schema);
+            r->schema = xstrdup(cp);
+        }
+    }
+
     ZOOM_resultset_addref (r);
 
     if (!r->connection->async || force_sync)
@@ -650,43 +715,59 @@ static zoom_ret do_connect (ZOOM_connection c)
 
     if (memcmp(c->host_port, "http:", 5) == 0)
     {
-#if HAVE_GSOAP
-        c->soap = soap_new();
-        c->soap->namespaces = srw_namespaces;
+#if HAVE_XML2
+        const char *path;
+        c->proto = PROTO_HTTP;
+        effective_host = c->host_port + 5;
+        if (*effective_host == '/')
+            effective_host++;
+        if (*effective_host == '/')
+            effective_host++;
+        if (!(path = strchr(effective_host, '/')))
+            path = "/";
+        xfree(c->path);
+        c->path = xstrdup(path);
 #else
         c->state = STATE_IDLE;
         set_ZOOM_error(c, ZOOM_ERROR_UNSUPPORTED_PROTOCOL, "SRW");
+        return zoom_complete;
 #endif
     }
-    else
+    c->cs = cs_create_host (effective_host, 0, &add);
+    
+    if (c->cs)
     {
-        c->cs = cs_create_host (effective_host, 0, &add);
-        
-        if (c->cs)
+        int ret = cs_connect (c->cs, add);
+        if (ret == 0)
         {
-            int ret = cs_connect (c->cs, add);
-            if (ret == 0)
-            {
-                ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_CONNECT);
-                ZOOM_connection_put_event(c, event);
+            ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_CONNECT);
+            ZOOM_connection_put_event(c, event);
+            if (c->proto == PROTO_Z3950)
                 ZOOM_connection_send_init(c);
-                c->state = STATE_ESTABLISHED;
-                return zoom_pending;
-            }
-            else if (ret > 0)
+            else
             {
-                c->state = STATE_CONNECTING; 
-                c->mask = ZOOM_SELECT_EXCEPT;
-                if (c->cs->io_pending & CS_WANT_WRITE)
-                    c->mask += ZOOM_SELECT_WRITE;
-                if (c->cs->io_pending & CS_WANT_READ)
-                    c->mask += ZOOM_SELECT_READ;
-                return zoom_pending;
+                /* no init request for SRW .. */
+                assert (c->tasks->which == ZOOM_TASK_CONNECT);
+                ZOOM_connection_remove_task (c);
+                c->mask = 0;
+                ZOOM_connection_exec_task (c);
             }
+            c->state = STATE_ESTABLISHED;
+            return zoom_pending;
+        }
+        else if (ret > 0)
+        {
+            c->state = STATE_CONNECTING; 
+            c->mask = ZOOM_SELECT_EXCEPT;
+            if (c->cs->io_pending & CS_WANT_WRITE)
+                c->mask += ZOOM_SELECT_WRITE;
+            if (c->cs->io_pending & CS_WANT_READ)
+                c->mask += ZOOM_SELECT_READ;
+            return zoom_pending;
         }
-        c->state = STATE_IDLE;
-        set_ZOOM_error(c, ZOOM_ERROR_CONNECT, effective_host);
     }
+    c->state = STATE_IDLE;
+    set_ZOOM_error(c, ZOOM_ERROR_CONNECT, effective_host);
     return zoom_complete;
 }
 
@@ -897,6 +978,123 @@ static zoom_ret ZOOM_connection_send_init (ZOOM_connection c)
     return send_APDU (c, apdu);
 }
 
+#if HAVE_XML2
+static zoom_ret send_srw (ZOOM_connection c, Z_SRW_PDU *sr)
+{
+    Z_SOAP_Handler h[2] = {
+        {"http://www.loc.gov/zing/srw/v1.0/", 0, (Z_SOAP_fun) yaz_srw_codec},
+        {0, 0, 0}
+    };
+    ODR o = odr_createmem(ODR_ENCODE);
+    int ret;
+    Z_SOAP *p = odr_malloc(o, sizeof(*p));
+    Z_GDU *gdu;
+    ZOOM_Event event;
+
+    gdu = z_get_HTTP_Request(c->odr_out);
+    gdu->u.HTTP_Request->path = c->path;
+    z_HTTP_header_add(c->odr_out, &gdu->u.HTTP_Request->headers,
+                      "Content-Type", "text/xml");
+    z_HTTP_header_add(c->odr_out, &gdu->u.HTTP_Request->headers,
+                      "SOAPAction", "\"\"");
+    p->which = Z_SOAP_generic;
+    p->u.generic = odr_malloc(o, sizeof(*p->u.generic));
+    p->u.generic->no = 0;
+    p->u.generic->ns = 0;
+    p->u.generic->p = sr;
+    p->ns = "http://schemas.xmlsoap.org/soap/envelope/";
+
+    ret = z_soap_codec(o, &p,
+                       &gdu->u.HTTP_Request->content_buf,
+                       &gdu->u.HTTP_Request->content_len, h);
+
+    if (!z_GDU(c->odr_out, &gdu, 0, 0))
+        return zoom_complete;
+    c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0);
+
+    odr_destroy(o);
+
+    event = ZOOM_Event_create (ZOOM_EVENT_SEND_APDU);
+    ZOOM_connection_put_event (c, event);
+    odr_reset(c->odr_out);
+    return do_write (c);
+}
+#endif
+
+#if HAVE_XML2
+static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
+{
+    int i;
+    ZOOM_resultset resultset = 0;
+    Z_SRW_PDU *sr = 0;
+
+    if (c->error)                  /* don't continue on error */
+	return zoom_complete;
+    assert (c->tasks);
+    if (c->tasks->which == ZOOM_TASK_SEARCH)
+    {
+        resultset = c->tasks->u.search.resultset;
+        resultset->setname = xstrdup ("default");
+        ZOOM_options_set (resultset->options, "setname", resultset->setname);
+    }
+    else if(c->tasks->which == ZOOM_TASK_RETRIEVE)
+    {
+        resultset = c->tasks->u.retrieve.resultset;
+
+        resultset->start = c->tasks->u.retrieve.start;
+        resultset->count = c->tasks->u.retrieve.count;
+        
+        if (resultset->start >= resultset->size)
+            return zoom_complete;
+        if (resultset->start + resultset->count > resultset->size)
+            resultset->count = resultset->size - resultset->start;
+
+        for (i = 0; i<resultset->count; i++)
+        {
+            ZOOM_record rec =
+                record_cache_lookup (resultset, i + resultset->start);
+            if (!rec)
+                break;
+        }
+        if (i == resultset->count)
+            return zoom_complete;
+    }
+    assert(resultset->query);
+        
+    sr = yaz_srw_get(c->odr_out, Z_SRW_searchRetrieve_request);
+
+    if (resultset->query->z_query->which == Z_Query_type_104
+        && resultset->query->z_query->u.type_104->which == Z_External_CQL)
+    {
+
+        sr->u.request->query_type = Z_SRW_query_type_cql;
+        sr->u.request->query.cql =resultset->query->z_query->u.type_104->u.cql;
+    }
+    else if (resultset->query->z_query->which == Z_Query_type_1 &&
+             resultset->query->z_query->u.type_1)
+    {
+        sr->u.request->query_type = Z_SRW_query_type_pqf;
+        sr->u.request->query.pqf = resultset->query->query_string;
+    }
+    else
+    {
+        set_ZOOM_error(c, ZOOM_ERROR_UNSUPPORTED_QUERY, 0);
+        return zoom_complete;
+    }
+    sr->u.request->startRecord = odr_intdup (c->odr_out, resultset->start + 1);
+    sr->u.request->maximumRecords = odr_intdup (c->odr_out, resultset->count);
+    sr->u.request->recordSchema = resultset->schema;
+
+ 
+    return send_srw(c, sr);
+}
+#else
+static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
+{
+    return zoom_complete;
+}
+#endif
+
 static zoom_ret ZOOM_connection_send_search (ZOOM_connection c)
 {
     ZOOM_resultset r;
@@ -907,7 +1105,6 @@ static zoom_ret ZOOM_connection_send_search (ZOOM_connection c)
     const char *elementSetName;
     const char *smallSetElementSetName;
     const char *mediumSetElementSetName;
-    const char *schema;
 
     assert (c->tasks);
     assert (c->tasks->which == ZOOM_TASK_SEARCH);
@@ -920,8 +1117,6 @@ static zoom_ret ZOOM_connection_send_search (ZOOM_connection c)
 	ZOOM_options_get (r->options, "smallSetElementSetName");
     mediumSetElementSetName =
 	ZOOM_options_get (r->options, "mediumSetElementSetName");
-    schema =
-	ZOOM_options_get (r->options, "schema");
 
     if (!smallSetElementSetName)
 	smallSetElementSetName = elementSetName;
@@ -930,10 +1125,10 @@ static zoom_ret ZOOM_connection_send_search (ZOOM_connection c)
 	mediumSetElementSetName = elementSetName;
 
     assert (r);
-    assert (r->z_query);
+    assert (r->query);
 
     /* prepare query for the search request */
-    search_req->query = r->z_query;
+    search_req->query = r->query->z_query;
 
     search_req->databaseNames =
 	set_DatabaseNames (c, r->options, &search_req->num_databaseNames);
@@ -952,7 +1147,7 @@ static zoom_ret ZOOM_connection_send_search (ZOOM_connection c)
 	*search_req->mediumSetPresentNumber = mspn;
     }
     else if (r->start == 0 && r->count > 0
-	     && r->piggyback && !r->r_sort_spec && !schema)
+	     && r->piggyback && !r->r_sort_spec && !r->schema)
     {
 	/* Regular piggyback - do it unless we're going to do sort */
 	*search_req->largeSetLowerBound = 2000000000;
@@ -1033,8 +1228,6 @@ static void response_diag (ZOOM_connection c, Z_DiagRec *p)
 	return;
     }
     r = p->u.defaultFormat;
-    c->diagset = yaz_z3950oid_to_str(r->diagnosticSetId, &oclass);
-
     switch (r->which)
     {
     case Z_DefaultDiagFormat_v2Addinfo:
@@ -1044,9 +1237,9 @@ static void response_diag (ZOOM_connection c, Z_DiagRec *p)
 	addinfo = r->u.v3Addinfo;
 	break;
     }
-    if (addinfo)
-	c->addinfo = xstrdup (addinfo);
-    c->error = *r->condition;
+    set_dset_error(c, *r->condition,
+                   yaz_z3950oid_to_str(r->diagnosticSetId, &oclass),
+                   addinfo, 0);
 }
 
 ZOOM_API(ZOOM_record)
@@ -1277,7 +1470,17 @@ ZOOM_record_get (ZOOM_record rec, const char *type, int *len)
     return 0;
 }
 
-static void record_cache_add (ZOOM_resultset r, Z_NamePlusRecord *npr, int pos)
+static int strcmp_null(const char *v1, const char *v2)
+{
+    if (!v1 && !v2)
+        return 0;
+    if (!v1 || !v2)
+        return -1;
+    return strcmp(v1, v2);
+}
+
+static void record_cache_add (ZOOM_resultset r, Z_NamePlusRecord *npr, 
+                              int pos)
 {
     ZOOM_record_cache rc;
     const char *elementSetName =
@@ -1289,20 +1492,16 @@ static void record_cache_add (ZOOM_resultset r, Z_NamePlusRecord *npr, int pos)
     {
 	if (pos == rc->pos)
 	{
-	    if ((!elementSetName && !rc->elementSetName)
-		|| (elementSetName && rc->elementSetName &&
-		    !strcmp (elementSetName, rc->elementSetName)))
-	    {
-                if ((!syntax && !rc->syntax)
-                    || (syntax && rc->syntax &&
-                        !strcmp (syntax, rc->syntax)))
-                {
-                    /* not destroying rc->npr (it's handled by nmem )*/
-                    rc->rec.npr = npr;
-                    /* keeping wrbuf_marc too */
-                    return;
-                }
-	    }
+	    if (strcmp_null(r->schema, rc->schema))
+                continue;
+	    if (strcmp_null(elementSetName,rc->elementSetName))
+                continue;
+            if (strcmp_null(syntax, rc->syntax))
+                continue;
+            /* not destroying rc->npr (it's handled by nmem )*/
+            rc->rec.npr = npr;
+            /* keeping wrbuf_marc too */
+            return;
 	}
     }
     rc = (ZOOM_record_cache) odr_malloc (r->odr, sizeof(*rc));
@@ -1319,6 +1518,11 @@ static void record_cache_add (ZOOM_resultset r, Z_NamePlusRecord *npr, int pos)
     else
 	rc->syntax = 0;
 
+    if (r->schema)
+	rc->schema = odr_strdup (r->odr, r->schema);
+    else
+	rc->schema = 0;
+
     rc->pos = pos;
     rc->next = r->record_cache;
     r->record_cache = rc;
@@ -1336,15 +1540,13 @@ static ZOOM_record record_cache_lookup (ZOOM_resultset r, int pos)
     {
 	if (pos == rc->pos)
 	{
-	    if ((!elementSetName && !rc->elementSetName)
-		|| (elementSetName && rc->elementSetName &&
-		    !strcmp (elementSetName, rc->elementSetName)))
-            {
-                if ((!syntax && !rc->syntax)
-                    || (syntax && rc->syntax &&
-                        !strcmp (syntax, rc->syntax)))
-                    return &rc->rec;
-            }
+	    if (strcmp_null(r->schema, rc->schema))
+                continue;
+	    if (strcmp_null(elementSetName,rc->elementSetName))
+                continue;
+            if (strcmp_null(syntax, rc->syntax))
+                continue;
+            return &rc->rec;
 	}
     }
     return 0;
@@ -1508,7 +1710,6 @@ static zoom_ret send_present (ZOOM_connection c)
     int i = 0;
     const char *syntax = 0;
     const char *elementSetName = 0;
-    const char *schema = 0;
     ZOOM_resultset  resultset;
 
     if (!c->tasks)
@@ -1535,7 +1736,6 @@ static zoom_ret send_present (ZOOM_connection c)
 
     syntax = ZOOM_resultset_option_get (resultset, "preferredRecordSyntax");
     elementSetName = ZOOM_resultset_option_get (resultset, "elementSetName");
-    schema = ZOOM_resultset_option_get (resultset, "schema");
 
     if (c->error)                  /* don't continue on error */
 	return zoom_complete;
@@ -1564,7 +1764,7 @@ static zoom_ret send_present (ZOOM_connection c)
 	req->preferredRecordSyntax =
 	    yaz_str_to_z3950oid (c->odr_out, CLASS_RECSYN, syntax);
 
-    if (schema && *schema)
+    if (resultset->schema && *resultset->schema)
     {
 	Z_RecordComposition *compo = (Z_RecordComposition *)
             odr_malloc (c->odr_out, sizeof(*compo));
@@ -1580,16 +1780,16 @@ static zoom_ret send_present (ZOOM_connection c)
         compo->u.complex->generic = (Z_Specification *)
             odr_malloc(c->odr_out, sizeof(*compo->u.complex->generic));
 
-        compo->u.complex->generic->which = Z_Specification_oid;
-        compo->u.complex->generic->u.oid = (Odr_oid *)
-            yaz_str_to_z3950oid (c->odr_out, CLASS_SCHEMA, schema);
+        compo->u.complex->generic->which = Z_Schema_oid;
+        compo->u.complex->generic->schema.oid = (Odr_oid *)
+            yaz_str_to_z3950oid (c->odr_out, CLASS_SCHEMA, resultset->schema);
 
-        if (!compo->u.complex->generic->u.oid)
+        if (!compo->u.complex->generic->schema.oid)
         {
             /* OID wasn't a schema! Try record syntax instead. */
 
-            compo->u.complex->generic->u.oid = (Odr_oid *)
-                yaz_str_to_z3950oid (c->odr_out, CLASS_RECSYN, schema);
+            compo->u.complex->generic->schema.oid = (Odr_oid *)
+                yaz_str_to_z3950oid (c->odr_out, CLASS_RECSYN, resultset->schema);
         }
         if (elementSetName && *elementSetName)
         {
@@ -1986,83 +2186,6 @@ ZOOM_package_option_get (ZOOM_package p, const char *key)
     return ZOOM_options_get (p->options, key);
 }
 
-#if HAVE_GSOAP
-static zoom_ret ZOOM_srw_search(ZOOM_connection c, ZOOM_resultset r,
-                                const char *cql)
-{
-    int ret;
-    struct xcql__operandType *xQuery = 0;
-    char *action = 0;
-    xsd__integer startRecord = r->start + 1;
-    xsd__integer maximumRecord = r->count;
-    const char *schema = ZOOM_resultset_option_get (r, "schema");
-    struct zs__searchRetrieveResponse res;
-    xsd__string recordPacking = 0;
-    
-
-    if (!schema)
-        schema = "http://www.loc.gov/marcxml/";
-
-    ret = soap_call_zs__searchRetrieveRequest(c->soap, c->host_port,
-                                              action,
-                                              &r->z_query->u.type_104->u.cql,
-                                              xQuery, 
-                                              0, 0,
-                                              &startRecord, &maximumRecord,
-                                              (char **) &schema,
-                                              &recordPacking,
-                                              &res);
-    if (ret != SOAP_OK)
-    {
-        const char **s = soap_faultdetail(c->soap);
-        xfree (c->addinfo);
-        c->addinfo = 0;
-        if (s && *s)
-            c->addinfo = xstrdup(*s);
-        c->diagset = "SOAP";
-        c->error = ret;
-    }
-    else
-    {
-        if (res.diagnostics.__sizeDiagnostics > 0)
-        {
-            int i = 0;
-            xfree (c->addinfo);
-            c->addinfo = 0;
-            c->diagset = "SRW";
-            c->error = res.diagnostics.diagnostic[i]->code;
-            if (res.diagnostics.diagnostic[i]->details)
-                c->addinfo =
-                    xstrdup(res.diagnostics.diagnostic[i]->details);
-            
-        }
-        else
-        {
-            int i;
-            r->size = res.numberOfRecords;
-            if (res.resultSetId)
-                r->setname = xstrdup(res.resultSetId);
-            for (i = 0; i < res.records.__sizeRecords; i++)
-            {
-                char *rdata = res.records.record[i]->recordData;
-                if (rdata)
-                {
-                    Z_NamePlusRecord *npr =
-                        odr_malloc(r->odr, sizeof(*npr));
-                    Z_External *ext =
-                        z_ext_record(r->odr, VAL_TEXT_XML,
-                                     rdata, strlen(rdata));
-                    npr->databaseName = 0;
-                    npr->which = Z_NamePlusRecord_databaseRecord;
-                    npr->u.databaseRecord = ext;
-                    record_cache_add (r, npr, r->start + i);
-                }
-            }
-        }
-    }
-    return zoom_complete;
-}
-#endif
 
 ZOOM_API(void)
 ZOOM_package_option_set (ZOOM_package p, const char *key,
@@ -2096,50 +2219,21 @@ static int ZOOM_connection_exec_task (ZOOM_connection c)
     }
     task->running = 1;
     ret = zoom_complete;
-    if (c->soap)
+    if (c->cs || task->which == ZOOM_TASK_CONNECT)
     {
-#if HAVE_GSOAP
-        ZOOM_resultset resultset;
         switch (task->which)
         {
         case ZOOM_TASK_SEARCH:
-            resultset = c->tasks->u.search.resultset;
-            if (resultset->z_query && 
-                resultset->z_query->which == Z_Query_type_104
-                && resultset->z_query->u.type_104->which == Z_External_CQL)
-                ret = ZOOM_srw_search(c, resultset, 
-                                      resultset->z_query->u.type_104->u.cql);
-            break;
-        case ZOOM_TASK_RETRIEVE:
-            resultset = c->tasks->u.retrieve.resultset;
-            resultset->start = c->tasks->u.retrieve.start;
-            resultset->count = c->tasks->u.retrieve.count;
-
-            if (resultset->start >= resultset->size)
-                return zoom_complete;
-            if (resultset->start + resultset->count > resultset->size)
-                resultset->count = resultset->size - resultset->start;
-
-            if (resultset->z_query && 
-                resultset->z_query->which == Z_Query_type_104
-                && resultset->z_query->u.type_104->which == Z_External_CQL)
-                ret = ZOOM_srw_search(c, resultset, 
-                                      resultset->z_query->u.type_104->u.cql);
-            break;
-        }
-#else
-        ;
-#endif
-    }
-    else if (c->cs || task->which == ZOOM_TASK_CONNECT)
-    {
-        switch (task->which)
-        {
-        case ZOOM_TASK_SEARCH:
-            ret = ZOOM_connection_send_search(c);
+            if (c->proto == PROTO_HTTP)
+                ret = ZOOM_connection_srw_send_search(c);
+            else
+                ret = ZOOM_connection_send_search(c);
             break;
         case ZOOM_TASK_RETRIEVE:
-            ret = send_present (c);
+            if (c->proto == PROTO_HTTP)
+                ret = ZOOM_connection_srw_send_search(c);
+            else
+                ret = send_present (c);
             break;
         case ZOOM_TASK_CONNECT:
             ret = do_connect(c);
@@ -2305,10 +2399,142 @@ static void handle_apdu (ZOOM_connection c, Z_APDU *apdu)
     }
 }
 
+#if HAVE_XML2
+static void handle_srw_response(ZOOM_connection c,
+                                Z_SRW_searchRetrieveResponse *res)
+{
+    ZOOM_resultset resultset = 0;
+    int i;
+    NMEM nmem;
+
+    if (!c->tasks)
+        return;
+
+    if (c->tasks->which == ZOOM_TASK_SEARCH)
+        resultset = c->tasks->u.search.resultset;
+    else if (c->tasks->which == ZOOM_TASK_RETRIEVE)
+        resultset = c->tasks->u.retrieve.resultset;
+    else
+	return ;
+
+    resultset->size = 0;
+
+    yaz_log(LOG_DEBUG, "got SRW response OK");
+    
+    if (res->numberOfRecords)
+        resultset->size = *res->numberOfRecords;
+
+    for (i = 0; i<res->num_records; i++)
+    {
+        int pos;
+
+        Z_NamePlusRecord *npr = (Z_NamePlusRecord *)
+            odr_malloc(c->odr_in, sizeof(Z_NamePlusRecord));
+
+        if (res->records[i].recordPosition && 
+            *res->records[i].recordPosition > 0)
+            pos = *res->records[i].recordPosition - 1;
+        else
+            pos = resultset->start + i;
+        
+        npr->databaseName = 0;
+        npr->which = Z_NamePlusRecord_databaseRecord;
+        npr->u.databaseRecord = (Z_External *)
+            odr_malloc(c->odr_in, sizeof(Z_External));
+        npr->u.databaseRecord->descriptor = 0;
+        npr->u.databaseRecord->direct_reference =
+            yaz_oidval_to_z3950oid(c->odr_in, CLASS_RECSYN, VAL_TEXT_XML);
+        npr->u.databaseRecord->which = Z_External_octet;
+        npr->u.databaseRecord->u.octet_aligned = (Odr_oct *)
+            odr_malloc(c->odr_in, sizeof(Odr_oct));
+        npr->u.databaseRecord->u.octet_aligned->buf = 
+            res->records[i].recordData_buf;
+        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);
+    }
+    if (res->num_diagnostics > 0)
+    {
+        set_dset_error(c, *res->diagnostics[0].code, "SRW",
+                       res->diagnostics[0].details, 0);
+    }
+    nmem = odr_extract_mem(c->odr_in);
+    nmem_transfer(resultset->odr->mem, nmem);
+    nmem_destroy(nmem);
+}
+#endif
+
+#if HAVE_XML2
+static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
+{
+    int ret = -1;
+    const char *content_type = z_HTTP_header_lookup(hres->headers,
+                                                    "Content-Type");
+    const char *connection_head = z_HTTP_header_lookup(hres->headers,
+                                                       "Connection");
+    c->mask = 0;
+    yaz_log (LOG_DEBUG, "handle_http");
+
+    if (content_type && !yaz_strcmp_del("text/xml", content_type, "; "))
+    {
+        Z_SOAP *soap_package = 0;
+        ODR o = odr_createmem(ODR_DECODE);
+        Z_SOAP_Handler soap_handlers[2] = {
+            {"http://www.loc.gov/zing/srw/v1.0/", 0,
+             (Z_SOAP_fun) yaz_srw_codec},
+            {0, 0, 0}
+        };
+        ret = z_soap_codec(o, &soap_package,
+                           &hres->content_buf, &hres->content_len,
+                           soap_handlers);
+        if (!ret && soap_package->which == Z_SOAP_generic &&
+            soap_package->u.generic->no == 0)
+        {
+            Z_SRW_PDU *sr = soap_package->u.generic->p;
+            if (sr->which == Z_SRW_searchRetrieve_response)
+                handle_srw_response(c, sr->u.response);
+            else
+                ret = -1;
+        }
+        else if (!ret && (soap_package->which == Z_SOAP_fault
+                          || soap_package->which == Z_SOAP_error))
+        {
+            set_HTTP_error(c, hres->code,
+                           soap_package->u.fault->fault_code,
+                           soap_package->u.fault->fault_string);
+        }
+        else
+            ret = -1;
+        odr_destroy(o);
+    }
+    if (ret)
+    {
+        if (hres->code != 200)
+            set_HTTP_error(c, hres->code, 0, 0);
+        else
+            set_ZOOM_error(c, ZOOM_ERROR_DECODE, 0);
+        do_close (c);
+    }
+    ZOOM_connection_remove_task(c);
+    if (!strcmp(hres->version, "1.0"))
+    {
+        /* HTTP 1.0: only if Keep-Alive we stay alive.. */
+        if (!connection_head || strcmp(connection_head, "Keep-Alive"))
+            do_close(c);
+    }
+    else 
+    {
+        /* HTTP 1.1: only if no close we stay alive .. */
+        if (connection_head && !strcmp(connection_head, "close"))
+            do_close(c);
+    }
+}
+#endif
+
 static int do_read (ZOOM_connection c)
 {
     int r;
-    Z_APDU *apdu;
     ZOOM_Event event;
     
     event = ZOOM_Event_create (ZOOM_EVENT_RECV_DATA);
@@ -2337,18 +2563,29 @@ static int do_read (ZOOM_connection c)
     }
     else
     {
+        Z_GDU *gdu;
         ZOOM_Event event;
 	odr_reset (c->odr_in);
 	odr_setbuf (c->odr_in, c->buf_in, r, 0);
         event = ZOOM_Event_create (ZOOM_EVENT_RECV_APDU);
         ZOOM_connection_put_event (c, event);
-	if (!z_APDU (c->odr_in, &apdu, 0, 0))
+
+	if (!z_GDU (c->odr_in, &gdu, 0, 0))
 	{
             set_ZOOM_error(c, ZOOM_ERROR_DECODE, 0);
 	    do_close (c);
 	}
-	else
-	    handle_apdu (c, apdu);
+	else if (gdu->which == Z_GDU_Z3950)
+	    handle_apdu (c, gdu->u.z3950);
+        else if (gdu->which == Z_GDU_HTTP_Response)
+        {
+#if HAVE_XML2
+            handle_http (c, gdu->u.HTTP_Response);
+#else
+            set_ZOOM_error(c, ZOOM_ERROR_DECODE, 0);
+	    do_close (c);
+#endif
+        }
         c->reconnect_ok = 0;
     }
     return 1;
@@ -2372,7 +2609,7 @@ static zoom_ret do_write_ex (ZOOM_connection c, char *buf_out, int len_out)
             yaz_log (LOG_DEBUG, "reconnect write");
             c->tasks->running = 0;
             ZOOM_connection_insert_task (c, ZOOM_TASK_CONNECT);
-            return zoom_complete;
+            return zoom_pending;
         }
 	if (c->state == STATE_CONNECTING)
 	    set_ZOOM_error(c, ZOOM_ERROR_CONNECT, 0);
@@ -2478,6 +2715,8 @@ ZOOM_diag_str (int error)
 	return "Timeout";
     case ZOOM_ERROR_UNSUPPORTED_PROTOCOL:
 	return "Unsupported protocol";
+    case ZOOM_ERROR_UNSUPPORTED_QUERY:
+	return "Unsupported query type";
     default:
 	return diagbib1_str (error);
     }
@@ -2490,22 +2729,16 @@ ZOOM_connection_error_x (ZOOM_connection c, const char **cp,
     int error = c->error;
     if (cp)
     {
-        if (!c->diagset)
+        if (!c->diagset || !strcmp(c->diagset, "ZOOM"))
+            *cp = ZOOM_diag_str(error);
+        else if (!strcmp(c->diagset, "HTTP"))
+            *cp = z_HTTP_errmsg(c->error);
+        else if (!strcmp(c->diagset, "Bib-1"))
             *cp = ZOOM_diag_str(error);
-#if HAVE_GSOAP
         else if (!strcmp(c->diagset, "SRW"))
-            *cp = yaz_srw_diag_str(error);
-        else if (c->soap && !strcmp(c->diagset, "SOAP"))
-        {
-            const char **s = soap_faultstring(c->soap);
-            if (s && *s)
-                *cp = *s;
-            else
-                *cp = "unknown";
-        }
-#endif
+            *cp = yaz_diag_srw_str(c->error);
         else
-            *cp = ZOOM_diag_str(error);
+            *cp = "Unknown error and diagnostic set";
     }
     if (addinfo)
         *addinfo = c->addinfo ? c->addinfo : "";
@@ -2554,7 +2787,16 @@ static int ZOOM_connection_do_io(ZOOM_connection c, int mask)
         else if (ret == 0)
         {
             ZOOM_connection_put_event (c, event);
-            ZOOM_connection_send_init (c);
+            if (c->proto == PROTO_Z3950)
+                ZOOM_connection_send_init(c);
+            else
+            {
+                /* no init request for SRW .. */
+                assert (c->tasks->which == ZOOM_TASK_CONNECT);
+                ZOOM_connection_remove_task (c);
+                c->mask = 0;
+                ZOOM_connection_exec_task (c);
+            }
             c->state = STATE_ESTABLISHED;
         }
         else