X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsrw.c;h=10b9b69db13c420c413a5a5fc2f9c02e8b7597ec;hb=8746c08e36ba07edc839f1396c17a27ea2915dc0;hp=07031c8b631df26b6852fee69be90785fdcd3fff;hpb=d6fb3aa1d14381512225362ac585de1dd426ce1e;p=yaz-moved-to-github.git

diff --git a/src/srw.c b/src/srw.c
index 07031c8..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.22 2004-02-23 12:12:25 adam Exp $
+ * $Id: srw.c,v 1.25 2004-03-17 18:43:35 adam Exp $
  */
 
 #include <yaz/srw.h>
@@ -42,7 +42,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 +52,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 +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;
@@ -318,7 +318,7 @@ 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/", 0);
+	    xmlNewNs(pptr, "info:srw/schema/1/diagnostic-v1.1", 0);
         for (i = 0; i < *num; i++)
         {
 	    const char *std_diag = "info:srw/diagnostic/1/";