c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

applied patches from Kasimier Buchcik for the attribute use support added

Browse Source 
* xmlschemas.c include/libxml/schemasInternals.h
  include/libxml/xmlerror.h: applied patches from Kasimier Buchcik
  for the attribute use support
* test/schemas/attruse* result/schemas/attruse*: added the
  tests to the regression suite.
Daniel
This commit is contained in:
Daniel Veillard 2004-04-16 16:46:51 +00:00
parent 377e1a9059
commit c85d0fec52
14 changed files with 130 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Fri Apr 16 18:44:47 CEST 2004 Daniel Veillard <daniel@veillard.com>
* xmlschemas.c include/libxml/schemasInternals.h
include/libxml/xmlerror.h: applied patches from Kasimier Buchcik
for the attribute use support
* test/schemas/attruse* result/schemas/attruse*: added the
tests to the regression suite.
Fri Apr 16 18:22:25 CEST 2004 Daniel Veillard <daniel@veillard.com>
* xmlsave.c: move the TODO as comments as the function while not

21
include/libxml/schemasInternals.h
View File

@ -112,6 +112,27 @@ struct _xmlSchemaAnnot {
*/
#define XML_SCHEMAS_ANYATTR_STRICT 3
/**
* XML_SCHEMAS_ATTR_USE_PROHIBITED:
*
* The attribute is prohibited.
*/
#define XML_SCHEMAS_ATTR_USE_PROHIBITED 0
/**
* XML_SCHEMAS_ATTR_USE_REQUIRED:
*
* The attribute is required.
*/
#define XML_SCHEMAS_ATTR_USE_REQUIRED 1
/**
* XML_SCHEMAS_ATTR_USE_OPTIONAL:
*
* The attribute is optional.
*/
#define XML_SCHEMAS_ATTR_USE_OPTIONAL 2
/**
* XML_SCHEMAS_ATTR_NSDEFAULT:
*

1
include/libxml/xmlerror.h
View File

@ -545,6 +545,7 @@ typedef enum {
XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI, /* 1770 */
XML_SCHEMAP_NOT_SCHEMA, /* 1771 */
XML_SCHEMAP_UNKNOWN_MEMBER_TYPE, /* 1772 */
XML_SCHEMAP_INVALID_ATTR_USE, /* 1723 */
XML_SCHEMAV_NOROOT = 1800,
XML_SCHEMAV_UNDECLAREDELEM, /* 1801 */
XML_SCHEMAV_NOTTOPLEVEL, /* 1802 */

1
result/schemas/attruse_0_0 Normal file
View File

@ -0,0 +1 @@
./test/schemas/attruse_0_0.xml validates

0
result/schemas/attruse_0_0.err Normal file
View File

1
result/schemas/attruse_0_1 Normal file
View File

@ -0,0 +1 @@
./test/schemas/attruse_0_1.xml fails to validate

3
result/schemas/attruse_0_1.err Normal file
View File

@ -0,0 +1,3 @@
./test/schemas/attruse_0_1.xml:3: element barA: Schemas validity error : required attribute attr on barA is missing
./test/schemas/attruse_0_1.xml:3: element barA: Schemas validity error : required attribute attr on barA is missing
./test/schemas/attruse_0_1.xml:3: element barA: Schemas validity error : required attribute attr on barA is missing

1
result/schemas/attruse_0_2 Normal file
View File

@ -0,0 +1 @@
./test/schemas/attruse_0_2.xml fails to validate

3
result/schemas/attruse_0_2.err Normal file
View File

@ -0,0 +1,3 @@
./test/schemas/attruse_0_2.xml:6: element barC: Schemas validity error : attribute attr on barC is prohibited
./test/schemas/attruse_0_2.xml:6: element barC: Schemas validity error : attribute attr on barC is prohibited
./test/schemas/attruse_0_2.xml:6: element barC: Schemas validity error : attribute attr on barC is prohibited

8
test/schemas/attruse_0_0.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<foo>
<barA attr="bar"/>
<barB attr="bar"/>
<barB />
<barC/>
</foo>

32
test/schemas/attruse_0_0.xsd Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="foo">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="barA" >
<xs:complexType>
<xs:attribute name="attr" type="xs:string" use="required" />
</xs:complexType>
</xs:element>
<xs:element name="barB" >
<xs:complexType>
<xs:attribute name="attr" type="xs:string" use="optional" />
</xs:complexType>
</xs:element>
<xs:element name="barC" >
<xs:complexType>
<xs:attribute name="attr" type="xs:string" use="prohibited" />
</xs:complexType>
</xs:element>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:schema>

8
test/schemas/attruse_0_1.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<foo>
<barA />
<barB attr="bar"/>
<barB />
<barC/>
</foo>

8
test/schemas/attruse_0_2.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<foo>
<barA attr="bar" />
<barB attr="bar"/>
<barB />
<barC attr="bar" />
</foo>

37
xmlschemas.c
View File

@ -1996,7 +1996,7 @@ static xmlSchemaAttributePtr
xmlSchemaParseAttribute(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
xmlNodePtr node)
{
const xmlChar *name, *refNs = NULL, *ref = NULL;
const xmlChar *name, *refNs = NULL, *ref = NULL, *attrVal;
xmlSchemaAttributePtr ret;
xmlNodePtr child = NULL;
char buf[100];
@ -2025,6 +2025,23 @@ xmlSchemaParseAttribute(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
if (ret == NULL) {
return (NULL);
}
/* Read the "use" attribute. */
attrVal = xmlSchemaGetProp(ctxt, node, "use");
if (attrVal != NULL) {
if (xmlStrEqual(attrVal, BAD_CAST "optional"))
ret->occurs = XML_SCHEMAS_ATTR_USE_OPTIONAL;
else if (xmlStrEqual(attrVal, BAD_CAST "prohibited"))
ret->occurs = XML_SCHEMAS_ATTR_USE_PROHIBITED;
else if (xmlStrEqual(attrVal, BAD_CAST "required"))
ret->occurs = XML_SCHEMAS_ATTR_USE_REQUIRED;
else
xmlSchemaPErr(ctxt, node,
XML_SCHEMAP_INVALID_ATTR_USE,
"attribute %s has an invalid value for \"use\"\n", name, NULL);
} else
ret->occurs = XML_SCHEMAS_ATTR_USE_OPTIONAL;
ret->ref = ref;
ret->refNs = refNs;
if ((ret->targetNamespace != NULL) &&
@ -6210,14 +6227,16 @@ static int
xmlSchemaValidateAttributes(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr elem,
xmlSchemaAttributePtr attributes)
{
int i, ret;
int i, ret, count = 1;
xmlAttrPtr attr;
xmlChar *value;
xmlSchemaAttributeGroupPtr group = NULL;
int found;
if (attributes == NULL)
return (0);
while (attributes != NULL) {
found = 0;
/*
* Handle attribute groups
*/
@ -6263,11 +6282,22 @@ xmlSchemaValidateAttributes(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr elem,
continue;
}
}
found = 1;
ctxt->cur = (xmlNodePtr) attributes;
if (attributes->subtypes == NULL) {
xmlSchemaVErr(ctxt, (xmlNodePtr) attr, XML_SCHEMAS_ERR_INTERNAL, "Internal error: attribute %s type not resolved\n", attr->name, NULL);
continue;
}
if (attributes->occurs == XML_SCHEMAS_ATTR_USE_PROHIBITED) {
xmlSchemaVErr(ctxt, elem, XML_SCHEMAS_ERR_INVALIDATTR, "attribute %s on %s is prohibited\n", attributes->name, elem->name);
/* Setting the state to XML_SCHEMAS_ATTR_CHECKED seems not very logical but it
surpresses the "attribute is unknown" error report. Please change this if you know better */
ctxt->attr[i].state = XML_SCHEMAS_ATTR_CHECKED;
break;
}
value = xmlNodeListGetString(elem->doc, attr->children, 1);
ret = xmlSchemaValidateSimpleValue(ctxt, attributes->subtypes,
value);
@ -6280,6 +6310,9 @@ xmlSchemaValidateAttributes(xmlSchemaValidCtxtPtr ctxt, xmlNodePtr elem,
xmlFree(value);
}
}
if ((!found) && (attributes->occurs == XML_SCHEMAS_ATTR_USE_REQUIRED)) {
xmlSchemaVErr(ctxt, elem, XML_SCHEMAS_ERR_MISSING, "required attribute %s on %s is missing\n", attributes->name, elem->name);
}
attributes = attributes->next;
}
return (ctxt->err);