X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zutil%2Fsrw.c;h=e8337b1d98de1fcb7955e0f7c82723ccd41adf2c;hb=d21f71aa7f9d30fdf457c58e7403723415506c1e;hp=4a66bbdd22259e226235c632177ee00a72644864;hpb=5f9dfb9266ab741d41a636249a39a254e4fb7211;p=yaz-moved-to-github.git

diff --git a/zutil/srw.c b/zutil/srw.c
index 4a66bbd..e8337b1 100644
--- a/zutil/srw.c
+++ b/zutil/srw.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2003, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: srw.c,v 1.7 2003-02-23 14:26:58 adam Exp $
+ * $Id: srw.c,v 1.10 2003-03-20 21:15:00 adam Exp $
  */
 
 #include <yaz/srw.h>
@@ -11,6 +11,21 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
+static void add_XML_n(xmlNodePtr ptr, const char *elem, char *val, int len)
+{
+    if (val)
+    {
+        xmlDocPtr doc = xmlParseMemory(val,len);
+        if (doc)
+        {
+            xmlNodePtr c = xmlNewChild(ptr, 0, elem, 0);
+            xmlNodePtr t = xmlDocGetRootElement(doc);
+            xmlAddChild(c, xmlCopyNode(t,1));
+            xmlFreeDoc(doc);
+        }
+    }
+}
+
 static void add_xsd_string_n(xmlNodePtr ptr, const char *elem, char *val,
                              int len)
 {
@@ -45,13 +60,17 @@ static int match_element(xmlNodePtr ptr, const char *elem)
     return 0;
 }
 
+#define CHECK_TYPE 0
+
 static int match_xsd_string_n(xmlNodePtr ptr, const char *elem, ODR o,
                               char **val, int *len)
 {
+#if CHECK_TYPE
     struct _xmlAttr *attr;
+#endif
     if (!match_element(ptr, elem))
         return 0;
-#if 0
+#if CHECK_TYPE
     for (attr = ptr->properties; attr; attr = attr->next)
         if (!strcmp(attr->name, "type") &&
             attr->children && attr->children->type == XML_TEXT_NODE)
@@ -85,10 +104,12 @@ static int match_xsd_string(xmlNodePtr ptr, const char *elem, ODR o,
                      
 static int match_xsd_integer(xmlNodePtr ptr, const char *elem, ODR o, int **val)
 {
+#if CHECK_TYPE
     struct _xmlAttr *attr;
+#endif
     if (!match_element(ptr, elem))
         return 0;
-#if 0
+#if CHECK_TYPE
     for (attr = ptr->properties; attr; attr = attr->next)
         if (!strcmp(attr->name, "type") &&
             attr->children && attr->children->type == XML_TEXT_NODE)
@@ -135,6 +156,7 @@ static int yaz_srw_records(ODR o, xmlNodePtr pptr, Z_SRW_record **recs,
             {
                 xmlNodePtr rptr;
                 (*recs)[i].recordSchema = 0;
+                (*recs)[i].recordPacking = Z_SRW_recordPacking_string;
                 (*recs)[i].recordData_buf = 0;
                 (*recs)[i].recordData_len = 0;
                 (*recs)[i].recordPosition = 0;
@@ -161,8 +183,17 @@ static int yaz_srw_records(ODR o, xmlNodePtr pptr, Z_SRW_record **recs,
         {
             xmlNodePtr rptr = xmlNewChild(pptr, 0, "record", 0);
             add_xsd_string(rptr, "recordSchema", (*recs)[i].recordSchema);
-            add_xsd_string_n(rptr, "recordData", (*recs)[i].recordData_buf,
-                             (*recs)[i].recordData_len);
+            switch((*recs)[i].recordPacking)
+            {
+            case Z_SRW_recordPacking_string:
+                add_xsd_string_n(rptr, "recordData", (*recs)[i].recordData_buf,
+                                 (*recs)[i].recordData_len);
+                break;
+            case Z_SRW_recordPacking_XML:
+                add_XML_n(rptr, "recordXML", (*recs)[i].recordData_buf,
+                          (*recs)[i].recordData_len);
+                break;
+            }
             add_xsd_integer(rptr, "recordPosition", (*recs)[i].recordPosition);
         }
     }
@@ -327,7 +358,6 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                                            &res->nextRecordPosition))
                     ;
             }
-
         }
         else
             return -1;
@@ -339,9 +369,12 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
         if ((*p)->which == Z_SRW_searchRetrieve_request)
         {
             Z_SRW_searchRetrieveRequest *req = (*p)->u.request;
-            xmlNsPtr ns_srw = xmlNewNs(pptr, ns, "zs");
-            xmlNodePtr ptr = xmlNewChild(pptr, ns_srw,
+            xmlNodePtr ptr = xmlNewChild(pptr, 0,
                                          "searchRetrieveRequest", 0);
+            xmlNsPtr ns_srw = xmlNewNs(ptr, ns, "zs");
+
+            xmlSetNs(ptr, ns_srw);
+
             switch(req->query_type)
             {
             case Z_SRW_query_type_cql:
@@ -374,10 +407,11 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
         else if ((*p)->which == Z_SRW_searchRetrieve_response)
         {
             Z_SRW_searchRetrieveResponse *res = (*p)->u.response;
-            xmlNsPtr ns_srw = xmlNewNs(pptr, ns, "zs");
-            xmlNodePtr ptr = xmlNewChild(pptr, ns_srw,
+            xmlNodePtr ptr = xmlNewChild(pptr, 0,
                                          "searchRetrieveResponse", 0);
+            xmlNsPtr ns_srw = xmlNewNs(ptr, ns, "zs");
 
+            xmlSetNs(ptr, ns_srw);
             add_xsd_integer(ptr, "numberOfRecords", res->numberOfRecords);
             add_xsd_string(ptr, "resultSetId", res->resultSetId);
             add_xsd_integer(ptr, "resultSetIdleTime", res->resultSetIdleTime);