X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsrw.c;h=10b9b69db13c420c413a5a5fc2f9c02e8b7597ec;hp=375df80a4f9048988f9bdc8b4547925cf801d060;hb=725fc033b729b22a1e0cfba614192b6fbfaeda4f;hpb=073195289eb9b73d6793fa283e5a7dca7a24fba8

diff --git a/src/srw.c b/src/srw.c
index 375df80..10b9b69 100644
--- a/src/srw.c
+++ b/src/srw.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2004, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: srw.c,v 1.16 2004-01-09 18:10:32 adam Exp $
+ * $Id: srw.c,v 1.25 2004-03-17 18:43:35 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,20 +39,20 @@ 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 xmlNewTextChild(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)
     {
         char str[30];
         sprintf(str, "%d", *val);
-        xmlNewChild(ptr, 0, elem, str);
+        xmlNewTextChild(ptr, 0, elem, str);
     }
 }
 
@@ -113,7 +113,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;
@@ -285,8 +285,9 @@ static int yaz_srw_diagnostics(ODR o, xmlNodePtr pptr, Z_SRW_diagnostic **recs,
         *recs = 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;
 	} 
         for (i = 0, ptr = pptr->children; ptr; ptr = ptr->next)
         {
@@ -294,16 +295,20 @@ 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_integer(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))
                         ;
+                    else if (match_xsd_string(rptr, "message", o, 
+                                              &(*recs)[i].message))
+                        ;
                 }
                 i++;
             }
@@ -313,11 +318,22 @@ 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/";
             xmlNodePtr rptr = xmlNewChild(pptr, ns_diag, "diagnostic", 0);
-            add_xsd_integer(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].uri && 
+		     !strncmp((*recs)[i].uri, std_diag, 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);
+	    }
             add_xsd_string(rptr, "details", (*recs)[i].details);
         }
     }