X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsrw.c;h=10b9b69db13c420c413a5a5fc2f9c02e8b7597ec;hb=8746c08e36ba07edc839f1396c17a27ea2915dc0;hp=7f571490731ec9e72c6cc4102a187b430f7d54ff;hpb=9911c0d04369165de4401aa6f9c908da3b22038e;p=yaz-moved-to-github.git diff --git a/src/srw.c b/src/srw.c index 7f57149..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.23 2004-02-23 12:57:19 adam Exp $ + * $Id: srw.c,v 1.25 2004-03-17 18:43:35 adam Exp $ */ #include @@ -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;