From: Bill Kendrick (William.Kendrick@wcom.com)
Date: Fri Oct 20 2000 - 13:59:02 EDT
On Fri, 20 Oct 2000 05:46:53 Daniel Veillard sent:
> *** valid.c 2000/10/11 15:16:38 1.74
> --- valid.c 2000/10/20 12:37:44
> *************** xmlValidateElementTypeElement(xmlValidCt
> *** 3505,3513 ****
> *child = cur;
> return(0);
> }
> do {
> ! cur = *child;
> ret = xmlValidateElementTypeExpr(ctxt, child, cont);
> } while (ret == 1);
> if (ret == -1) return(-1);
> *child = cur;
> --- 3505,3523 ----
> *child = cur;
> return(0);
> }
> + if (ret == -1) return(-1);
> + cur = *child;
> do {
> ! if (*child == NULL)
> ! break; /* while */
> ! if (((*child)->type == XML_TEXT_NODE) &&
> ! (xmlIsBlankNode(*child))) {
> ! *child = (*child)->next;
> ! continue;
> ! }
> ret = xmlValidateElementTypeExpr(ctxt, child, cont);
> + if (ret == 1)
> + cur = *child;
> } while (ret == 1);
> if (ret == -1) return(-1);
> *child = cur;
> *************** child_ok:
> *** 3812,3817 ****
> --- 3822,3832 ----
> child = elem->children;
> cont = elemDecl->content;
> ret = xmlValidateElementTypeElement(ctxt, &child, cont);
> + while ((child != NULL) && (child->type == XML_TEXT_NODE) &&
> + (xmlIsBlankNode(child))) {
> + child = child->next;
> + continue;
> + }
> if ((ret == 0) || (child != NULL)) {
> char expr[1000];
> char list[2000];
Well, it at least fixed the validation of the cleo.xml file! :)
(With and without specifically mentioning "cleo.dtd" at the top
of "cleo.xml")
Thanks!
-bill!
William.Kendrick@wcom.com
ext 6218
---- Message from the list xml@rpmfind.net Archived at : http://xmlsoft.org/messages/ to unsubscribe: echo "unsubscribe xml" | mail majordomo@rpmfind.net
This archive was generated by hypermail 2b29 : Fri Oct 20 2000 - 14:43:33 EDT