Fix sequence of diagnostic element
[yaz-moved-to-github.git] / src / srw.c
index cd8b48c..7fb30b4 100644 (file)
--- a/src/srw.c
+++ b/src/srw.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2002-2003, Index Data.
+ * Copyright (c) 2002-2004, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: srw.c,v 1.4 2003-12-20 22:40:46 adam Exp $
+ * $Id: srw.c,v 1.18 2004-01-15 23:33:29 adam Exp $
  */
 
 #include <yaz/srw.h>
@@ -26,7 +26,7 @@ static void add_XML_n(xmlNodePtr ptr, const char *elem, char *val, int len)
     }
 }
 
-xmlNodePtr add_xsd_string_n(xmlNodePtr ptr, const char *elem, char *val,
+xmlNodePtr add_xsd_string_n(xmlNodePtr ptr, const char *elem, const char *val,
                            int len)
 {
     if (val)
@@ -39,14 +39,14 @@ xmlNodePtr add_xsd_string_n(xmlNodePtr ptr, const char *elem, char *val,
     return 0;
 }
 
-xmlNodePtr add_xsd_string(xmlNodePtr ptr, const char *elem, char *val)
+xmlNodePtr add_xsd_string(xmlNodePtr ptr, const char *elem, const char *val)
 {
     if (val)
         return xmlNewChild(ptr, 0, elem, val);
     return 0;
 }
 
-static void add_xsd_integer(xmlNodePtr ptr, const char *elem, int *val)
+static void add_xsd_integer(xmlNodePtr ptr, const char *elem, const int *val)
 {
     if (val)
     {
@@ -113,12 +113,14 @@ static int match_xsd_XML_n(xmlNodePtr ptr, const char *elem, ODR o,
     if (!match_element(ptr, elem))
         return 0;
     ptr = ptr->children;
+    while (ptr && ptr->type != XML_TEXT_NODE && ptr->type != XML_COMMENT_NODE)
+       ptr = ptr->next;
     if (!ptr)
         return 0;
     buf = xmlBufferCreate();
-
+    
     xmlNodeDump(buf, ptr->doc, ptr, 0, 0);
-
+    
     *val = odr_malloc(o, buf->use+1);
     memcpy (*val, buf->content, buf->use);
     (*val)[buf->use] = '\0';
@@ -130,7 +132,6 @@ static int match_xsd_XML_n(xmlNodePtr ptr, const char *elem, ODR o,
 
     return 1;
 }
-
                      
 static int match_xsd_integer(xmlNodePtr ptr, const char *elem, ODR o, int **val)
 {
@@ -182,9 +183,9 @@ static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec,
                ;
            else if (match_xsd_string(ptr, "recordPacking", o, &spack))
            {
-               if (pack && !strcmp(spack, "xml"))
+               if (spack && !strcmp(spack, "xml"))
                    pack = Z_SRW_recordPacking_XML;
-               if (pack && !strcmp(spack, "string"))
+               if (spack && !strcmp(spack, "string"))
                    pack = Z_SRW_recordPacking_string;
            }
            else if (match_xsd_integer(ptr, "recordPosition", o, 
@@ -223,6 +224,7 @@ static int yaz_srw_record(ODR o, xmlNodePtr pptr, Z_SRW_record *rec,
        }
        add_xsd_integer(ptr, "recordPosition", rec->recordPosition);
     }
+    return 0;
 }
 
 static int yaz_srw_records(ODR o, xmlNodePtr pptr, Z_SRW_record **recs,
@@ -242,11 +244,14 @@ static int yaz_srw_records(ODR o, xmlNodePtr pptr, Z_SRW_record **recs,
         if (!*num)
             return 1;
         *recs = odr_malloc(o, *num * sizeof(**recs));
-        for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next, i++)
+        for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next)
         {
             if (ptr->type == XML_ELEMENT_NODE &&
                 !strcmp(ptr->name, "record"))
+           {
                yaz_srw_record(o, ptr, (*recs)+i, client_data, ns);
+               i++;
+           }
         }
     }
     else if (o->direction == ODR_ENCODE)
@@ -278,7 +283,12 @@ static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
         if (!*num)
             return 1;
         *recs = odr_malloc(o, *num * sizeof(**recs));
-        for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next, i++)
+       for (i = 0; i < *num; i++)
+       {
+            (*recs)[i].code = 0;
+            (*recs)[i].details = 0;
+       } 
+        for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next)
         {
             if (ptr->type == XML_ELEMENT_NODE &&
                 !strcmp(ptr->name, "diagnostic"))
@@ -302,16 +312,90 @@ static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
     else if (o->direction == ODR_ENCODE)
     {
         int i;
+       xmlNsPtr ns_diag =
+           xmlNewNs(pptr, "http://www.loc.gov/zing/srw/diagnostics/", "diag");
         for (i = 0; i < *num; i++)
         {
-            xmlNodePtr rptr = xmlNewChild(pptr, 0, "diagnostic", 0);
+            xmlNodePtr rptr = xmlNewChild(pptr, ns_diag, "diagnostic", 0);
             add_xsd_integer(rptr, "code", (*recs)[i].code);
+           if ((*recs)[i].code)
+           {
+               const char *message = yaz_diag_srw_str(*(*recs)[i].code);
+               if (message)
+                   add_xsd_string(rptr, "message", message);
+           }
             add_xsd_string(rptr, "details", (*recs)[i].details);
         }
     }
     return 0;
 }
 
+static int yaz_srw_term(ODR o, xmlNodePtr pptr, Z_SRW_scanTerm *term,
+                       void *client_data, const char *ns)
+{
+    if (o->direction == ODR_DECODE)
+    {
+       xmlNodePtr ptr;
+       term->value = 0;
+       term->numberOfRecords = 0;
+       term->displayTerm = 0;
+       for (ptr = pptr->children; ptr; ptr = ptr->next)
+       {
+           if (match_xsd_string(ptr, "value", o,  &term->value))
+               ;
+           else if (match_xsd_integer(ptr, "numberOfRecords", o, 
+                                  &term->numberOfRecords))
+               ;
+           else if (match_xsd_string(ptr, "displayTerm", o, 
+                                     &term->displayTerm))
+               ;
+       }
+    }
+    else if (o->direction == ODR_ENCODE)
+    {
+       xmlNodePtr ptr = pptr;
+       add_xsd_string(ptr, "value", term->value);
+       add_xsd_integer(ptr, "value", term->numberOfRecords);
+       add_xsd_string(ptr, "displayTerm", term->displayTerm);
+    }
+    return 0;
+}
+
+static int yaz_srw_terms(ODR o, xmlNodePtr pptr, Z_SRW_scanTerm **terms,
+                        int *num, void *client_data, const char *ns)
+{
+    if (o->direction == ODR_DECODE)
+    {
+        int i;
+        xmlNodePtr ptr;
+        *num = 0;
+        for (ptr = pptr->children; ptr; ptr = ptr->next)
+        {
+            if (ptr->type == XML_ELEMENT_NODE &&
+                !strcmp(ptr->name, "term"))
+                (*num)++;
+        }
+        if (!*num)
+            return 1;
+        *terms = odr_malloc(o, *num * sizeof(**terms));
+        for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next, i++)
+        {
+            if (ptr->type == XML_ELEMENT_NODE &&
+                !strcmp(ptr->name, "term"))
+               yaz_srw_term(o, ptr, (*terms)+i, client_data, ns);
+        }
+    }
+    else if (o->direction == ODR_ENCODE)
+    {
+        int i;
+        for (i = 0; i < *num; i++)
+        {
+            xmlNodePtr rptr = xmlNewChild(pptr, 0, "term", 0);
+           yaz_srw_term(o, rptr, (*terms)+i, client_data, ns);
+        }
+    }
+    return 0;
+}
 
 int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                   void *client_data, const char *ns)
@@ -348,11 +432,17 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             req->maximumRecords = 0;
             req->recordSchema = 0;
             req->recordPacking = 0;
+           req->recordXPath = 0;
+           req->resultSetTTL = 0;
+           req->stylesheet = 0;
             req->database = 0;
 
             for (; ptr; ptr = ptr->next)
             {
-                if (match_xsd_string(ptr, "query", o, 
+               if (match_xsd_string(ptr, "version", o,
+                                    &(*p)->srw_version))
+                    ;
+                else if (match_xsd_string(ptr, "query", o, 
                                      &req->query.cql))
                     req->query_type = Z_SRW_query_type_cql;
                 else if (match_xsd_string(ptr, "pQuery", o, 
@@ -361,26 +451,32 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 else if (match_xsd_string(ptr, "xQuery", o, 
                                      &req->query.xcql))
                     req->query_type = Z_SRW_query_type_xcql;
-                else if (match_xsd_string(ptr, "sortKeys", o, 
-                                          &req->sort.sortKeys))
-                    req->sort_type = Z_SRW_sort_type_sort;
-                else if (match_xsd_string(ptr, "recordSchema", o, 
-                                          &req->recordSchema))
-                    ;
-                else if (match_xsd_string(ptr, "recordPacking", o,
-                                          &req->recordPacking))
-                    ;
                 else if (match_xsd_integer(ptr, "startRecord", o,
                                            &req->startRecord))
                     ;
                 else if (match_xsd_integer(ptr, "maximumRecords", o,
                                            &req->maximumRecords))
                     ;
-                else if (match_xsd_string(ptr, "database", o,
+                else if (match_xsd_string(ptr, "recordPacking", o,
+                                          &req->recordPacking))
+                    ;
+                else if (match_xsd_string(ptr, "recordSchema", o, 
+                                          &req->recordSchema))
+                    ;
+                else if (match_xsd_string(ptr, "recordXPath", o,
+                                          &req->recordXPath))
+                    ;
+                else if (match_xsd_string(ptr, "resultSetTTL", o,
                                            &req->database))
                     ;
-                else if (match_xsd_string(ptr, "version", o,
-                                           &(*p)->srw_version))
+                else if (match_xsd_string(ptr, "sortKeys", o, 
+                                          &req->sort.sortKeys))
+                    req->sort_type = Z_SRW_sort_type_sort;
+                else if (match_xsd_string(ptr, "stylesheet", o,
+                                           &req->stylesheet))
+                    ;
+                else if (match_xsd_string(ptr, "database", o,
+                                           &req->database))
                     ;
                 /* missing is xQuery, xSortKeys .. */
             }
@@ -404,7 +500,10 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
 
             for (; ptr; ptr = ptr->next)
             {
-                if (match_xsd_integer(ptr, "numberOfRecords", o, 
+                if (match_xsd_string(ptr, "version", o,
+                                    &(*p)->srw_version))
+                    ;
+                else if (match_xsd_integer(ptr, "numberOfRecords", o, 
                                       &res->numberOfRecords))
                     ;
                 else if (match_xsd_string(ptr, "resultSetId", o, 
@@ -417,16 +516,13 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                     yaz_srw_records(o, ptr, &res->records,
                                     &res->num_records, client_data,
                                     ns);
+                else if (match_xsd_integer(ptr, "nextRecordPosition", o,
+                                           &res->nextRecordPosition))
+                    ;
                 else if (match_element(ptr, "diagnostics"))
                     yaz_srw_diagnostics(o, ptr, &res->diagnostics,
                                         &res->num_diagnostics,
                                         client_data, ns);
-                else if (match_xsd_integer(ptr, "nextRecordPosition", o,
-                                           &res->nextRecordPosition))
-                    ;
-                else if (match_xsd_string(ptr, "version", o,
-                                           &(*p)->srw_version))
-                    ;
             }
         }
         else if (!strcmp(method->name, "explainRequest"))
@@ -437,14 +533,22 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             (*p)->which = Z_SRW_explain_request;
             req = (*p)->u.explain_request = odr_malloc(o, sizeof(*req));
            req->recordPacking = 0;
+           req->database = 0;
+           req->stylesheet = 0;
            for (; ptr; ptr = ptr->next)
            {
-               if (match_xsd_string(ptr, "recordPacking", o,
-                                    &req->recordPacking))
-                   ;
-                else if (match_xsd_string(ptr, "version", o,
+                if (match_xsd_string(ptr, "version", o,
                                            &(*p)->srw_version))
                    ;
+               else if (match_xsd_string(ptr, "stylesheet", o,
+                                         &req->stylesheet))
+                   ;
+               else if (match_xsd_string(ptr, "recordPacking", o,
+                                    &req->recordPacking))
+                   ;
+               else if (match_xsd_string(ptr, "database", o,
+                                    &req->database))
+                    ;
            }
         }
         else if (!strcmp(method->name, "explainResponse"))
@@ -454,14 +558,83 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
 
             (*p)->which = Z_SRW_explain_response;
             res = (*p)->u.explain_response = odr_malloc(o, sizeof(*res));
-           
+            res->diagnostics = 0;
+            res->num_diagnostics = 0;
+
            for (; ptr; ptr = ptr->next)
            {
-               if (match_element(ptr, "record"))
+                if (match_xsd_string(ptr, "version", o,
+                                           &(*p)->srw_version))
+                   ;
+               else if (match_element(ptr, "record"))
                    yaz_srw_record(o, ptr, &res->record, client_data, ns);
-                else if (match_xsd_string(ptr, "version", o,
-                                         &(*p)->srw_version))
+               else if (match_element(ptr, "diagnostics"))
+                    yaz_srw_diagnostics(o, ptr, &res->diagnostics,
+                                        &res->num_diagnostics,
+                                        client_data, ns);
+               ;
+           }
+        }
+        else if (!strcmp(method->name, "scanRequest"))
+        {
+            Z_SRW_scanRequest *req;
+            xmlNodePtr ptr = method->children;
+
+            (*p)->which = Z_SRW_scan_request;
+            req = (*p)->u.scan_request = odr_malloc(o, sizeof(*req));
+           req->database = 0;
+           req->scanClause = 0;
+           req->stylesheet = 0;
+           req->responsePosition = 0;
+           req->maximumTerms = 0;
+           
+           for (; ptr; ptr = ptr->next)
+           {
+               if (match_xsd_string(ptr, "version", o,
+                                    &(*p)->srw_version))
+                   ;
+               else if (match_xsd_string(ptr, "scanClause", o,
+                                    &req->scanClause))
+                   ;
+               else if (match_xsd_integer(ptr, "responsePosition", o,
+                                          &req->responsePosition))
+                   ;
+               else if (match_xsd_integer(ptr, "maximumTerms", o,
+                                          &req->maximumTerms))
+                    ;
+               else if (match_xsd_string(ptr, "stylesheet", o,
+                                         &req->stylesheet))
+                   ;
+               else if (match_xsd_string(ptr, "database", o,
+                                         &req->database))
+                    ;
+           }
+        }
+        else if (!strcmp(method->name, "scanResponse"))
+        {
+            Z_SRW_scanResponse *res;
+            xmlNodePtr ptr = method->children;
+
+            (*p)->which = Z_SRW_scan_response;
+            res = (*p)->u.scan_response = odr_malloc(o, sizeof(*res));
+           res->terms = 0;
+           res->num_terms = 0;
+           res->diagnostics = 0;
+           res->num_diagnostics = 0;
+           
+           for (; ptr; ptr = ptr->next)
+           {
+               if (match_xsd_string(ptr, "version", o,
+                                    &(*p)->srw_version))
                    ;
+                else if (match_element(ptr, "terms"))
+                    yaz_srw_terms(o, ptr, &res->terms,
+                                 &res->num_terms, client_data,
+                                 ns);
+               else if (match_element(ptr, "diagnostics"))
+                    yaz_srw_diagnostics(o, ptr, &res->diagnostics,
+                                        &res->num_diagnostics,
+                                        client_data, ns);
            }
         }
         else
@@ -497,6 +670,12 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 add_xsd_string(ptr, "pQuery", req->query.pqf);
                 break;
             }
+            add_xsd_integer(ptr, "startRecord", req->startRecord);
+            add_xsd_integer(ptr, "maximumRecords", req->maximumRecords);
+            add_xsd_string(ptr, "recordPacking", req->recordPacking);
+            add_xsd_string(ptr, "recordSchema", req->recordSchema);
+            add_xsd_string(ptr, "recordXPath", req->recordXPath);
+            add_xsd_integer(ptr, "resultSetTTL", req->resultSetTTL);
             switch(req->sort_type)
             {
             case Z_SRW_sort_type_none:
@@ -508,10 +687,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 add_xsd_string(ptr, "xSortKeys", req->sort.xSortKeys);
                 break;
             }
-            add_xsd_integer(ptr, "startRecord", req->startRecord);
-            add_xsd_integer(ptr, "maximumRecords", req->maximumRecords);
-            add_xsd_string(ptr, "recordSchema", req->recordSchema);
-            add_xsd_string(ptr, "recordPacking", req->recordPacking);
+            add_xsd_string(ptr, "stylesheet", req->stylesheet);
             add_xsd_string(ptr, "database", req->database);
         }
         else if ((*p)->which == Z_SRW_searchRetrieve_response)
@@ -533,22 +709,26 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                 yaz_srw_records(o, rptr, &res->records, &res->num_records,
                                 client_data, ns);
             }
+            add_xsd_integer(ptr, "nextRecordPosition",
+                           res->nextRecordPosition);
             if (res->num_diagnostics)
             {
                 xmlNodePtr rptr = xmlNewChild(ptr, 0, "diagnostics", 0);
                 yaz_srw_diagnostics(o, rptr, &res->diagnostics,
                                     &res->num_diagnostics, client_data, ns);
             }
-            add_xsd_integer(ptr, "nextRecordPosition", res->nextRecordPosition);
         }
         else if ((*p)->which == Z_SRW_explain_request)
         {
+            Z_SRW_explainRequest *req = (*p)->u.explain_request;
             xmlNodePtr ptr = xmlNewChild(pptr, 0, "explainRequest", 0);
            ns_srw = xmlNewNs(ptr, ns, "zs");
            xmlSetNs(ptr, ns_srw);
 
-           if ((*p)->srw_version)
-               add_xsd_string(ptr, "version", (*p)->srw_version);
+           add_xsd_string(ptr, "version", (*p)->srw_version);
+            add_xsd_string(ptr, "recordPacking", req->recordPacking);
+            add_xsd_string(ptr, "stylesheet", req->stylesheet);
+            add_xsd_string(ptr, "database", req->database);
         }
         else if ((*p)->which == Z_SRW_explain_response)
         {
@@ -557,10 +737,54 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
            ns_srw = xmlNewNs(ptr, ns, "zs");
            xmlSetNs(ptr, ns_srw);
 
-           if ((*p)->srw_version)
-               add_xsd_string(ptr, "version", (*p)->srw_version);
-            ptr = xmlNewChild(ptr, 0, "record", 0);
-           yaz_srw_record(o, ptr, &res->record, client_data, ns);
+           add_xsd_string(ptr, "version", (*p)->srw_version);
+           if (1)
+           {
+               xmlNodePtr ptr1 = xmlNewChild(ptr, 0, "record", 0);
+               yaz_srw_record(o, ptr1, &res->record, client_data, ns);
+           }
+           if (res->num_diagnostics)
+           {
+               xmlNodePtr rptr = xmlNewChild(ptr, 0, "diagnostics", 0);
+               yaz_srw_diagnostics(o, rptr, &res->diagnostics,
+                                    &res->num_diagnostics, client_data, ns);
+            }
+        }
+        else if ((*p)->which == Z_SRW_scan_request)
+        {
+            Z_SRW_scanRequest *req = (*p)->u.scan_request;
+            xmlNodePtr ptr = xmlNewChild(pptr, 0, "scanRequest", 0);
+           ns_srw = xmlNewNs(ptr, ns, "zs");
+           xmlSetNs(ptr, ns_srw);
+
+           add_xsd_string(ptr, "version", (*p)->srw_version);
+           add_xsd_string(ptr, "scanClause", req->scanClause);
+           add_xsd_integer(ptr, "responsePosition", req->responsePosition);
+           add_xsd_integer(ptr, "maximumTerms", req->maximumTerms);
+           add_xsd_string(ptr, "stylesheet", req->stylesheet);
+            add_xsd_string(ptr, "database", req->database);
+        }
+        else if ((*p)->which == Z_SRW_scan_response)
+        {
+            Z_SRW_scanResponse *res = (*p)->u.scan_response;
+            xmlNodePtr ptr = xmlNewChild(pptr, 0, "scanResponse", 0);
+           ns_srw = xmlNewNs(ptr, ns, "zs");
+           xmlSetNs(ptr, ns_srw);
+
+           add_xsd_string(ptr, "version", (*p)->srw_version);
+
+            if (res->num_terms)
+            {
+                xmlNodePtr rptr = xmlNewChild(ptr, 0, "terms", 0);
+                yaz_srw_terms(o, rptr, &res->terms, &res->num_terms,
+                             client_data, ns);
+            }
+           if (res->num_diagnostics)
+           {
+               xmlNodePtr rptr = xmlNewChild(ptr, 0, "diagnostics", 0);
+               yaz_srw_diagnostics(o, rptr, &res->diagnostics,
+                                    &res->num_diagnostics, client_data, ns);
+            }
         }
         else
             return -1;
@@ -569,348 +793,6 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
     return 0;
 }
 
-Z_SRW_PDU *yaz_srw_get(ODR o, int which)
-{
-    Z_SRW_PDU *sr = odr_malloc(o, sizeof(*o));
-
-    sr->srw_version = odr_strdup(o, "1.1");
-    sr->which = which;
-    switch(which)
-    {
-    case Z_SRW_searchRetrieve_request:
-        sr->u.request = (Z_SRW_searchRetrieveRequest *)
-            odr_malloc(o, sizeof(*sr->u.request));
-        sr->u.request->query_type = Z_SRW_query_type_cql;
-        sr->u.request->query.cql = 0;
-        sr->u.request->sort_type = Z_SRW_sort_type_none;
-        sr->u.request->sort.none = 0;
-        sr->u.request->startRecord = 0;
-        sr->u.request->maximumRecords = 0;
-        sr->u.request->recordSchema = 0;
-        sr->u.request->recordPacking = 0;
-       sr->u.request->database = 0;
-        break;
-    case Z_SRW_searchRetrieve_response:
-        sr->u.response = (Z_SRW_searchRetrieveResponse *)
-            odr_malloc(o, sizeof(*sr->u.response));
-        sr->u.response->numberOfRecords = 0;
-        sr->u.response->resultSetId = 0;
-        sr->u.response->resultSetIdleTime = 0;
-        sr->u.response->records = 0;
-        sr->u.response->num_records = 0;
-        sr->u.response->diagnostics = 0;
-        sr->u.response->num_diagnostics = 0;
-        sr->u.response->nextRecordPosition = 0;
-        break;
-    case Z_SRW_explain_request:
-        sr->u.explain_request = (Z_SRW_explainRequest *)
-            odr_malloc(o, sizeof(*sr->u.explain_request));
-        sr->u.explain_request->recordPacking = 0;
-       sr->u.explain_request->database = 0;
-        break;
-    case Z_SRW_explain_response:
-        sr->u.explain_response = (Z_SRW_explainResponse *)
-            odr_malloc(o, sizeof(*sr->u.explain_response));
-       sr->u.explain_response->record.recordData_buf = 0;
-       sr->u.explain_response->record.recordData_len = 0;
-       sr->u.explain_response->record.recordSchema = 0;
-       sr->u.explain_response->record.recordPosition = 0;
-       sr->u.explain_response->record.recordPacking = Z_SRW_recordPacking_string;
-    }
-    return sr;
-}
-
 #endif
 
 
-static struct {
-    int code;
-    const char *msg;
-} yaz_srw_codes [] = {
-{1, "Permanent system error"}, 
-{2, "System temporarily unavailable"}, 
-{3, "Authentication error"}, 
-/* Diagnostics Relating to CQL */
-{10, "Illegal query"}, 
-{11, "Unsupported query type (XCQL vs CQL)"}, 
-{12, "Too many characters in query"}, 
-{13, "Unbalanced or illegal use of parentheses"}, 
-{14, "Unbalanced or illegal use of quotes"}, 
-{15, "Illegal or unsupported context set"}, 
-{16, "Illegal or unsupported index"}, 
-{17, "Illegal or unsupported combination of index and context set"}, 
-{18, "Illegal or unsupported combination of indexes"}, 
-{19, "Illegal or unsupported relation"}, 
-{20, "Illegal or unsupported relation modifier"}, 
-{21, "Illegal or unsupported combination of relation modifers"}, 
-{22, "Illegal or unsupported combination of relation and index"}, 
-{23, "Too many characters in term"}, 
-{24, "Illegal combination of relation and term"}, 
-{25, "Special characters not quoted in term"}, 
-{26, "Non special character escaped in term"}, 
-{27, "Empty term unsupported"}, 
-{28, "Masking character not supported"}, 
-{29, "Masked words too short"}, 
-{30, "Too many masking characters in term"}, 
-{31, "Anchoring character not supported"}, 
-{32, "Anchoring character in illegal or unsupported position"}, 
-{33, "Combination of proximity/adjacency and masking characters not supported"}, 
-{34, "Combination of proximity/adjacency and anchoring characters not supported"}, 
-{35, "Terms only exclusion (stop) words"}, 
-{36, "Term in invalid format for index or relation"}, 
-{37, "Illegal or unsupported boolean operator"}, 
-{38, "Too many boolean operators in query"}, 
-{39, "Proximity not supported"}, 
-{40, "Illegal or unsupported proximity relation"}, 
-{41, "Illegal or unsupported proximity distance"}, 
-{42, "Illegal or unsupported proximity unit"}, 
-{43, "Illegal or unsupported proximity ordering"}, 
-{44, "Illegal or unsupported combination of proximity modifiers"}, 
-{45, "context set name (prefix) assigned to multiple identifiers"}, 
-/* Diagnostics Relating to Result Sets */
-{50, "Result sets not supported"}, 
-{51, "Result set does not exist"}, 
-{52, "Result set temporarily unavailable"}, 
-{53, "Result sets only supported for retrieval"}, 
-{54, "Retrieval may only occur from an existing result set"}, 
-{55, "Combination of result sets with search terms not supported"}, 
-{56, "Only combination of single result set with search terms supported"}, 
-{57, "Result set created but no records available"}, 
-{58, "Result set created with unpredictable partial results available"}, 
-{59, "Result set created with valid partial results available"}, 
-/* Diagnostics Relating to Records */
-{60, "Too many records retrieved"}, 
-{61, "First record position out of range"}, 
-{62, "Negative number of records requested"}, 
-{63, "System error in retrieving records"}, 
-{64, "Record temporarily unavailable"}, 
-{65, "Record does not exist"}, 
-{66, "Unknown schema for retrieval"}, 
-{67, "Record not available in this schema"}, 
-{68, "Not authorised to send record"}, 
-{69, "Not authorised to send record in this schema"}, 
-{70, "Record too large to send"}, 
-/* Diagnostics Relating to Sorting */
-{80, "Sort not supported"}, 
-{81, "Unsupported sort type (sortKeys vs xSortKeys)"}, 
-{82, "Illegal or unsupported sort sequence"}, 
-{83, "Too many records"}, 
-{84, "Too many sort keys"}, 
-{85, "Duplicate sort keys"}, 
-{86, "Incompatible record formats"}, 
-{87, "Unsupported schema for sort"}, 
-{88, "Unsupported tag path for sort"}, 
-{89, "Tag path illegal or unsupported for schema"}, 
-{90, "Illegal or unsupported direction value"}, 
-{91, "Illegal or unsupported case value"}, 
-{92, "Illegal or unsupported missing value action"}, 
-/* Diagnostics Relating to Explain */
-{100, "Explain not supported"}, 
-{101, "Explain request type not supported (SOAP vs GET)"}, 
-{102, "Explain record temporarily unavailable"},
-{0, 0}
-};
-
-const char *yaz_diag_srw_str (int code)
-{
-    int i;
-    for (i = 0; yaz_srw_codes[i].code; i++)
-        if (yaz_srw_codes[i].code == code)
-            return yaz_srw_codes[i].msg;
-    return 0;
-}
-
-
-/* bib1:srw */
-static int srw_bib1_map[] = {
-    1, 1,
-    2, 2,
-    3, 11,
-    4, 35,
-    5, 12,
-    6, 38,
-    7, 30,
-    8, 32,
-    9, 29,
-    10, 10,
-    11, 12,
-    11, 23,
-    12, 60,
-    13, 61,
-    13, 62,
-    14, 63,
-    14, 64,
-    14, 65,
-    15, 68,
-    15, 69,
-    16, 70,
-    17, 70,
-    18, 50,
-    19, 55,
-    20, 56, 
-    21, 52,
-    22, 50,
-    23, 1,  /* bad map */
-    24, 63, /* bad map */
-    25, 63, /* bad map */
-    26, 63, /* bad map */
-    27, 51,
-    28, 52,
-    29, 52,
-    30, 51,
-    31, 57,
-    32, 58,
-    33, 59,
-    100, 1, /* bad map */
-    101, 3,
-    102, 3,
-    103, 3,
-    104, 3,
-    105, 3, 
-    106, 66,
-    107, 11,
-    108, 10,
-    108, 13,
-    108, 14,
-    108, 25,
-    108, 26,
-    108, 27,
-    108, 45,
-        
-    109, 1,
-    110, 37,
-    111, 1,
-    112, 58,
-    113, 10,
-    114, 16,
-    115, 16,
-    116, 16,
-    117, 19,
-    118, 22,
-    119, 32,
-    119, 31,
-    120, 28,
-    121, 15,
-    122, 32,
-    123, 22,
-    123, 17,
-    123, 18,
-    124, 24,
-    125, 36,
-    126, 36, 
-    127, 36,
-    128, 51,
-    129, 39,
-    130, 43,
-    131, 40,
-    132, 42,
-    201, 44,
-    201, 33,
-    201, 34,
-    202, 41,
-    203, 43,
-    205, 1,  /* bad map */
-    206, 1,  /* bad map */
-    207, 89,
-    208, 1,  /* bad map */
-    209, 80,
-    210, 80,
-    210, 81,
-    211, 84,
-    212, 85,
-    213, 92,
-    214, 90,
-    215, 91,
-    216, 92,
-    217, 63,
-    218, 1,  /* bad map */
-    219, 1,  /* bad map */
-    220, 1,  /* bad map */
-    221, 1,  /* bad map */
-    222, 1,  /* bad map */
-    223, 1,  /* bad map */
-    224, 1,  /* bad map */
-    225, 1,  /* bad map */
-    226, 1,  /* bad map */
-    227, 66,
-    228, 1,  /* bad map */
-    229, 36,
-    230, 83,
-    231, 89,
-    232, 1,
-    233, 1, /* bad map */
-    234, 1, /* bad map */
-    235, 2,
-    236, 3, 
-    237, 82,
-    238, 67,
-    239, 66,
-    240, 1, /* bad map */
-    241, 1, /* bad map */
-    242, 70,
-    243, 1, /* bad map */
-    244, 66,
-    245, 10,
-    246, 10,
-    247, 10,
-    1001, 1, /* bad map */
-    1002, 1, /* bad map */
-    1003, 1, /* bad map */
-    1004, 1, /* bad map */
-    1005, 1, /* bad map */
-    1006, 1, /* bad map */
-    1007, 100,
-    1008, 1, 
-    1009, 1,
-    1010, 3,
-    1011, 3,
-    1012, 3,
-    1013, 3,
-    1014, 3,
-    1015, 3,
-    1015, 3,
-    1016, 3,
-    1017, 3,
-    1018, 2,
-    1019, 2,
-    1020, 2,
-    1021, 3,
-    1022, 3,
-    1023, 3,
-    1024, 16,
-    1025, 3,
-    1026, 64,
-    1027, 1,
-    1028, 65,
-    1029, 1,
-    1040, 1,
-    /* 1041-1065 */
-    1066, 66,
-    1066, 67,
-    0
-};
-
-int yaz_diag_bib1_to_srw (int code)
-{
-    const int *p = srw_bib1_map;
-    while (*p)
-    {
-        if (code == p[0])
-            return p[1];
-        p += 2;
-    }
-    return 1;
-}
-
-int yaz_diag_srw_to_bib1(int code)
-{
-    const int *p = srw_bib1_map;
-    while (*p)
-    {
-        if (code == p[1])
-            return p[0];
-        p += 2;
-    }
-    return 1;
-}
-