diff --git a/ChangeLog b/ChangeLog index d28f7b05..cfb5cb4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 3 17:58:25 CEST 2004 Daniel Veillard + + * xmlschemas.c: new patch from Kasimier Buchcik for processContents + of wildcards attribute handling + * test/schemas/anyAttr-* result/schemas/anyAttr-*: added specific + regression tests + Thu Jun 3 13:20:36 CEST 2004 Daniel Veillard * parser.c: fixed a bug where invalid charrefs may not be detected diff --git a/result/schemas/anyAttr-processContents-err1_0_0 b/result/schemas/anyAttr-processContents-err1_0_0 new file mode 100644 index 00000000..43e77aac --- /dev/null +++ b/result/schemas/anyAttr-processContents-err1_0_0 @@ -0,0 +1 @@ +./test/schemas/anyAttr-processContents-err1_0.xml fails to validate diff --git a/result/schemas/anyAttr-processContents-err1_0_0.err b/result/schemas/anyAttr-processContents-err1_0_0.err new file mode 100644 index 00000000..3152bc65 --- /dev/null +++ b/result/schemas/anyAttr-processContents-err1_0_0.err @@ -0,0 +1,3 @@ +./test/schemas/anyAttr-processContents-err1_0.xml:11: element elem.lax: Schemas validity error : Failed to validate basic type language +./test/schemas/anyAttr-processContents-err1_0.xml:11: element elem.lax: Schemas validity error : Attribute bar on elem.lax does not match type +./test/schemas/anyAttr-processContents-err1_0.xml:12: element elem.strict: Schemas validity error : Attribute barB on elem.strict is unknown diff --git a/result/schemas/anyAttr-processContents1_0_0 b/result/schemas/anyAttr-processContents1_0_0 new file mode 100644 index 00000000..30d0cc28 --- /dev/null +++ b/result/schemas/anyAttr-processContents1_0_0 @@ -0,0 +1 @@ +./test/schemas/anyAttr-processContents1_0.xml validates diff --git a/result/schemas/anyAttr-processContents1_0_0.err b/result/schemas/anyAttr-processContents1_0_0.err new file mode 100644 index 00000000..e69de29b diff --git a/test/schemas/anyAttr-processContents-err1_0.xml b/test/schemas/anyAttr-processContents-err1_0.xml new file mode 100644 index 00000000..a0122f4b --- /dev/null +++ b/test/schemas/anyAttr-processContents-err1_0.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/test/schemas/anyAttr-processContents-err1_0.xsd b/test/schemas/anyAttr-processContents-err1_0.xsd new file mode 100644 index 00000000..cc2a0fdc --- /dev/null +++ b/test/schemas/anyAttr-processContents-err1_0.xsd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/schemas/anyAttr-processContents1_0.xml b/test/schemas/anyAttr-processContents1_0.xml new file mode 100644 index 00000000..f8210893 --- /dev/null +++ b/test/schemas/anyAttr-processContents1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/test/schemas/anyAttr-processContents1_0.xsd b/test/schemas/anyAttr-processContents1_0.xsd new file mode 100644 index 00000000..a468702d --- /dev/null +++ b/test/schemas/anyAttr-processContents1_0.xsd @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xmlschemas.c b/xmlschemas.c index 17f612f1..e810e9ab 100644 --- a/xmlschemas.c +++ b/xmlschemas.c @@ -8344,6 +8344,7 @@ xmlSchemaValidateAttributes(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr elem, xmlSche int ret; xmlAttrPtr attr; /* An attribute on the element. */ xmlChar *value; + const xmlChar *nsURI; xmlSchemaAttributeLinkPtr attrUse; xmlSchemaAttributePtr attrDecl; int found; @@ -8430,7 +8431,7 @@ xmlSchemaValidateAttributes(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr elem, xmlSche printf("found\n"); #endif found = 1; - ctxt->cur = (xmlNodePtr) attr; + ctxt->cur = (xmlNodePtr) attr; if (attrDecl->subtypes == NULL) { curState->state = XML_SCHEMAS_ATTR_TYPE_NOT_RESOLVED; @@ -8505,6 +8506,14 @@ xmlSchemaValidateAttributes(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr elem, xmlSche #ifdef DEBUG_ATTR_VALIDATION xmlSchemaWildcardNsPtr ns; printf("matching wildcard: [%d] of complexType: %s\n", type->attributeWildcard, type->name); + if (type->attributeWildcard->processContents == + XML_SCHEMAS_ANY_LAX) + printf("processContents: lax\n"); + else if (type->attributeWildcard->processContents == + XML_SCHEMAS_ANY_STRICT) + printf("processContents: strict\n"); + else + printf("processContents: skip\n"); if (type->attributeWildcard->any) printf("type: any\n"); else if (type->attributeWildcard->negNsSet != NULL) { @@ -8526,26 +8535,52 @@ xmlSchemaValidateAttributes(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr elem, xmlSche } else printf("empty\n"); -#endif - /* - * TODO: Implement processContents. - */ + +#endif curState = ctxt->attr; while (curState != NULL) { - if ((curState->state == XML_SCHEMAS_ATTR_UNKNOWN) && - (curState->attr != NULL)) { - if (curState->attr->ns != NULL) { - if (xmlSchemaMatchesWildcardNs(type->attributeWildcard, - curState->attr->ns->href)) + if (curState->state == XML_SCHEMAS_ATTR_UNKNOWN) { + if (curState->attr->ns != NULL) + nsURI = curState->attr->ns->href; + else + nsURI = NULL; + if (xmlSchemaMatchesWildcardNs(type->attributeWildcard, + nsURI)) { + /* + * Handle processContents. + */ + if ((type->attributeWildcard->processContents == + XML_SCHEMAS_ANY_LAX) || + (type->attributeWildcard->processContents == + XML_SCHEMAS_ANY_STRICT)) { + + attr = curState->attr; + attrDecl = xmlSchemaGetAttribute(ctxt->schema, + attr->name, nsURI); + if (attrDecl != NULL) { + value = xmlNodeListGetString(elem->doc, attr->children, 1); + ret = xmlSchemaValidateSimpleValue(ctxt, attrDecl->subtypes, + value); + if (ret != 0) + curState->state = XML_SCHEMAS_ATTR_INVALID_VALUE; + else + curState->state = XML_SCHEMAS_ATTR_CHECKED; + curState->decl = attrDecl; + if (value != NULL) { + xmlFree(value); + } + + } else if (type->attributeWildcard->processContents == + XML_SCHEMAS_ANY_LAX) { + curState->state = XML_SCHEMAS_ATTR_CHECKED; + } + } else curState->state = XML_SCHEMAS_ATTR_CHECKED; - } else if (xmlSchemaMatchesWildcardNs(type->attributeWildcard, - NULL)) - curState->state = XML_SCHEMAS_ATTR_CHECKED; - } + } + } curState = curState->next; } } - #ifdef DEBUG_ATTR_VALIDATION if (redundant) xmlGenericError(xmlGenericErrorContext,