X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsrw.c;h=07ecccf436af07e46b1de56d45ce8fab4aebe069;hb=5c3d2d2ab097e4bb59ba5718a396b020a2d302c0;hp=ca8ff016cd0f28ee0220e79e73638c9866ff4670;hpb=163abf332e441c2d39cf6ee4e83bad169fa1c59c;p=yaz-moved-to-github.git

diff --git a/src/srw.c b/src/srw.c
index ca8ff01..07ecccf 100644
--- a/src/srw.c
+++ b/src/srw.c
@@ -2,7 +2,11 @@
  * Copyright (c) 2002-2004, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: srw.c,v 1.19 2004-01-27 12:15:12 adam Exp $
+ * $Id: srw.c,v 1.28 2004-10-31 19:23:22 adam Exp $
+ */
+/**
+ * \file srw.c
+ * \brief Implements SRW/SRU package encoding and decoding
  */
 
 #include <yaz/srw.h>
@@ -42,7 +46,7 @@ xmlNodePtr add_xsd_string_n(xmlNodePtr ptr, const char *elem, const char *val,
 xmlNodePtr add_xsd_string(xmlNodePtr ptr, const char *elem, const char *val)
 {
     if (val)
-        return xmlNewChild(ptr, 0, elem, val);
+        return xmlNewTextChild(ptr, 0, elem, val);
     return 0;
 }
 
@@ -52,7 +56,7 @@ static void add_xsd_integer(xmlNodePtr ptr, const char *elem, const int *val)
     {
         char str[30];
         sprintf(str, "%d", *val);
-        xmlNewChild(ptr, 0, elem, str);
+        xmlNewTextChild(ptr, 0, elem, str);
     }
 }
 
@@ -113,7 +117,7 @@ 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)
+    while (ptr && (ptr->type == XML_TEXT_NODE || ptr->type == XML_COMMENT_NODE))
 	ptr = ptr->next;
     if (!ptr)
         return 0;
@@ -243,7 +247,7 @@ static int yaz_srw_records(ODR o, xmlNodePtr pptr, Z_SRW_record **recs,
         }
         if (!*num)
             return 1;
-        *recs = odr_malloc(o, *num * sizeof(**recs));
+        *recs = (Z_SRW_record *) odr_malloc(o, *num * sizeof(**recs));
         for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next)
         {
             if (ptr->type == XML_ELEMENT_NODE &&
@@ -282,10 +286,10 @@ static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
         }
         if (!*num)
             return 1;
-        *recs = odr_malloc(o, *num * sizeof(**recs));
+        *recs = (Z_SRW_diagnostic *) odr_malloc(o, *num * sizeof(**recs));
 	for (i = 0; i < *num; i++)
 	{
-            (*recs)[i].code = 0;
+            (*recs)[i].uri = 0;
             (*recs)[i].details = 0;
             (*recs)[i].message = 0;
 	} 
@@ -295,13 +299,13 @@ static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
                 !strcmp(ptr->name, "diagnostic"))
             {
                 xmlNodePtr rptr;
-                (*recs)[i].code = 0;
+                (*recs)[i].uri = 0;
                 (*recs)[i].details = 0;
                 (*recs)[i].message = 0;
                 for (rptr = ptr->children; rptr; rptr = rptr->next)
                 {
-                    if (match_xsd_string(rptr, "code", o, 
-					 &(*recs)[i].code))
+                    if (match_xsd_string(rptr, "uri", o, 
+					 &(*recs)[i].uri))
                         ;
                     else if (match_xsd_string(rptr, "details", o, 
                                               &(*recs)[i].details))
@@ -318,18 +322,18 @@ static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
     {
         int i;
 	xmlNsPtr ns_diag =
-	    xmlNewNs(pptr, "http://www.loc.gov/zing/srw/diagnostics/", "diag");
+	    xmlNewNs(pptr, "info:srw/schema/1/diagnostic-v1.1", 0);
         for (i = 0; i < *num; i++)
         {
-	    const char *std_diag = "info:srw/diagnostic/1/1/";
+	    const char *std_diag = "info:srw/diagnostic/1/";
             xmlNodePtr rptr = xmlNewChild(pptr, ns_diag, "diagnostic", 0);
-            add_xsd_string(rptr, "code", (*recs)[i].code);
+            add_xsd_string(rptr, "uri", (*recs)[i].uri);
 	    if ((*recs)[i].message)
 		add_xsd_string(rptr, "message", (*recs)[i].message);
-	    else if ((*recs)[i].code && 
-		     !strncmp((*recs)[i].code, std_diag, strlen(std_diag)))
+	    else if ((*recs)[i].uri && 
+		     !strncmp((*recs)[i].uri, std_diag, strlen(std_diag)))
 	    {
-		int no = atoi((*recs)[i].code + strlen(std_diag));
+		int no = atoi((*recs)[i].uri + strlen(std_diag));
 		const char *message = yaz_diag_srw_str(no);
 		if (message)
 		    add_xsd_string(rptr, "message", message);
@@ -387,7 +391,7 @@ static int yaz_srw_terms(ODR o, xmlNodePtr pptr, Z_SRW_scanTerm **terms,
         }
         if (!*num)
             return 1;
-        *terms = odr_malloc(o, *num * sizeof(**terms));
+        *terms = (Z_SRW_scanTerm *) odr_malloc(o, *num * sizeof(**terms));
         for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next, i++)
         {
             if (ptr->type == XML_ELEMENT_NODE &&
@@ -410,7 +414,7 @@ static int yaz_srw_terms(ODR o, xmlNodePtr pptr, Z_SRW_scanTerm **terms,
 int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
                   void *client_data, const char *ns)
 {
-    xmlNodePtr pptr = vptr;
+    xmlNodePtr pptr = (xmlNodePtr) vptr;
     if (o->direction == ODR_DECODE)
     {
 	Z_SRW_PDU **p = handler_data;
@@ -424,7 +428,7 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
         if (method->type != XML_ELEMENT_NODE)
             return -1;
 
-	*p = odr_malloc(o, sizeof(**p));
+	*p = (Z_SRW_PDU *) odr_malloc(o, sizeof(**p));
 	(*p)->srw_version = odr_strdup(o, "1.1");
 	
         if (!strcmp(method->name, "searchRetrieveRequest"))
@@ -433,7 +437,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             Z_SRW_searchRetrieveRequest *req;
 
             (*p)->which = Z_SRW_searchRetrieve_request;
-            req = (*p)->u.request = odr_malloc(o, sizeof(*req));
+            req = (*p)->u.request = (Z_SRW_searchRetrieveRequest *)
+		odr_malloc(o, sizeof(*req));
             req->query_type = Z_SRW_query_type_cql;
             req->query.cql = 0;
             req->sort_type = Z_SRW_sort_type_none;
@@ -497,7 +502,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             Z_SRW_searchRetrieveResponse *res;
 
             (*p)->which = Z_SRW_searchRetrieve_response;
-            res = (*p)->u.response = odr_malloc(o, sizeof(*res));
+            res = (*p)->u.response = (Z_SRW_searchRetrieveResponse *)
+		odr_malloc(o, sizeof(*res));
 
             res->numberOfRecords = 0;
             res->resultSetId = 0;
@@ -541,7 +547,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
 	    xmlNodePtr ptr = method->children;
             
             (*p)->which = Z_SRW_explain_request;
-            req = (*p)->u.explain_request = odr_malloc(o, sizeof(*req));
+            req = (*p)->u.explain_request = (Z_SRW_explainRequest *)
+		odr_malloc(o, sizeof(*req));
 	    req->recordPacking = 0;
 	    req->database = 0;
 	    req->stylesheet = 0;
@@ -567,9 +574,14 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             xmlNodePtr ptr = method->children;
 
             (*p)->which = Z_SRW_explain_response;
-            res = (*p)->u.explain_response = odr_malloc(o, sizeof(*res));
+            res = (*p)->u.explain_response = (Z_SRW_explainResponse*)
+		odr_malloc(o, sizeof(*res));
             res->diagnostics = 0;
             res->num_diagnostics = 0;
+	    res->record.recordSchema = 0;
+	    res->record.recordData_buf = 0;
+	    res->record.recordData_len = 0;
+	    res->record.recordPosition = 0;
 
 	    for (; ptr; ptr = ptr->next)
 	    {
@@ -591,7 +603,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             xmlNodePtr ptr = method->children;
 
             (*p)->which = Z_SRW_scan_request;
-            req = (*p)->u.scan_request = odr_malloc(o, sizeof(*req));
+            req = (*p)->u.scan_request = (Z_SRW_scanRequest *)
+		odr_malloc(o, sizeof(*req));
 	    req->database = 0;
 	    req->scanClause = 0;
 	    req->stylesheet = 0;
@@ -626,7 +639,8 @@ int yaz_srw_codec(ODR o, void * vptr, Z_SRW_PDU **handler_data,
             xmlNodePtr ptr = method->children;
 
             (*p)->which = Z_SRW_scan_response;
-            res = (*p)->u.scan_response = odr_malloc(o, sizeof(*res));
+            res = (*p)->u.scan_response = (Z_SRW_scanResponse *)
+		odr_malloc(o, sizeof(*res));
 	    res->terms = 0;
 	    res->num_terms = 0;
 	    res->diagnostics = 0;