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

Exposed targetNamespace for simple/complex types, model groups, attribute

Browse Source 
* include/libxml/schemasInternals.h xmlschemas.c:
  Exposed targetNamespace for simple/complex types, model groups,
  attribute groups and notations (reported by Michael Hewarth
  to the mailing list). Added targetNamespace to xmlSchemaType,
  xmlSchemaAttributeGroup and xmlSchemaNotation.
  Tiny cosmetic change to the content model error report output.
* result//all_*.err result//any3_0_0.err result//choice_*.err
  result//list0_0_1.err result//list0_1_1.err: Adapted output
  of regression tests.
This commit is contained in:
Kasimier T. Buchcik 2005-01-13 16:57:20 +00:00
parent de938cd4d7
commit 31113c7e86
16 changed files with 59 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Thu Jan 13 17:42:55 CET 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
* include/libxml/schemasInternals.h xmlschemas.c:
Exposed targetNamespace for simple/complex types, model groups,
attribute groups and notations (reported by Michael Hewarth
to the mailing list). Added targetNamespace to xmlSchemaType,
xmlSchemaAttributeGroup and xmlSchemaNotation.
Tiny cosmetic change to the content model error report output.
* result//all_*.err result//any3_0_0.err result//choice_*.err
result//list0_0_1.err result//list0_1_1.err: Adapted output
of regression tests.
Thu Jan 13 13:20:51 CET 2005 Kasimier Buchcik <libxml2-cvs@cazic.net>
* xmlschemas.c: Put the fix of Daniel (from Tue Jan 11 14:41:47 CET)

3
include/libxml/schemasInternals.h
View File

@ -350,6 +350,7 @@ struct _xmlSchemaAttributeGroup {
xmlSchemaWildcardPtr attributeWildcard;
const xmlChar *refPrefix;
xmlSchemaAttributeGroupPtr refItem; /* The referenced attribute group */
const xmlChar *targetNamespace;
};
/**
@ -533,6 +534,7 @@ struct _xmlSchemaType {
const xmlChar *refPrefix;
xmlSchemaTypePtr contentTypeDef;
xmlRegexpPtr contModel;
const xmlChar *targetNamespace;
};
/*
@ -730,6 +732,7 @@ struct _xmlSchemaNotation {
const xmlChar *name;
xmlSchemaAnnotPtr annot;
const xmlChar *identifier;
const xmlChar *targetNamespace;
};
/**

2
result/schemas/all_0_3.err
View File

@ -1 +1 @@
./test/schemas/all_3.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is 'c'.
./test/schemas/all_3.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is ( c ).

2
result/schemas/all_0_4.err
View File

@ -1 +1 @@
./test/schemas/all_4.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is one of 'a', 'b', 'c'.
./test/schemas/all_4.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is one of ( a, b, c ).

2
result/schemas/all_0_5.err
View File

@ -1 +1 @@
./test/schemas/all_5.xml:1: element a: Schemas validity error : Element 'a': This element is not expected. Expected is 'c'.
./test/schemas/all_5.xml:1: element a: Schemas validity error : Element 'a': This element is not expected. Expected is ( c ).

2
result/schemas/all_0_6.err
View File

@ -1 +1 @@
./test/schemas/all_6.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is one of 'b', 'c'.
./test/schemas/all_6.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is one of ( b, c ).

2
result/schemas/all_0_7.err
View File

@ -1 +1 @@
./test/schemas/all_7.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is 'c'.
./test/schemas/all_7.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is ( c ).

2
result/schemas/all_1_5.err
View File

@ -1 +1 @@
./test/schemas/all_5.xml:1: element a: Schemas validity error : Element 'a': This element is not expected. Expected is 'c'.
./test/schemas/all_5.xml:1: element a: Schemas validity error : Element 'a': This element is not expected. Expected is ( c ).

2
result/schemas/all_2_1.err
View File

@ -1 +1 @@
./test/schemas/all_1.xml:1: element c: Schemas validity error : Element 'c': This element is not expected. Expected is 'a'.
./test/schemas/all_1.xml:1: element c: Schemas validity error : Element 'c': This element is not expected. Expected is ( a ).

2
result/schemas/all_2_4.err
View File

@ -1 +1 @@
./test/schemas/all_4.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is one of 'a', 'b'.
./test/schemas/all_4.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is one of ( a, b ).

2
result/schemas/any3_0_0.err
View File

@ -1 +1 @@
./test/schemas/any3_0.xml:12: element bar.A: Schemas validity error : Element 'bar.A': This element is not expected. Expected is one of {##other:http://FOO}*.
./test/schemas/any3_0.xml:12: element bar.A: Schemas validity error : Element 'bar.A': This element is not expected. Expected is one of ( {##other:http://FOO}* ).

2
result/schemas/choice_0_4.err
View File

@ -1 +1 @@
./test/schemas/choice_4.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is one of 'a', 'b'.
./test/schemas/choice_4.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is one of ( a, b ).

2
result/schemas/choice_2_4.err
View File

@ -1 +1 @@
./test/schemas/choice_4.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is one of 'a', 'b'.
./test/schemas/choice_4.xml:1: element doc: Schemas validity error : Element 'doc': Missing child element(s). Expected is one of ( a, b ).

2
result/schemas/list0_0_1.err
View File

@ -1 +1 @@
./test/schemas/list0_1.xml:1: element test: Schemas validity error : Element 'test': Missing child element(s). Expected is 'string'.
./test/schemas/list0_1.xml:1: element test: Schemas validity error : Element 'test': Missing child element(s). Expected is ( string ).

2
result/schemas/list0_1_1.err
View File

@ -1 +1 @@
./test/schemas/list0_1.xml:1: element test: Schemas validity error : Element 'test': Missing child element(s). Expected is 'string'.
./test/schemas/list0_1.xml:1: element test: Schemas validity error : Element 'test': Missing child element(s). Expected is ( string ).

53
xmlschemas.c
View File

@ -1127,9 +1127,9 @@ xmlSchemaVComplexTypeElemErr(xmlSchemaValidCtxtPtr ctxt,
*/
if (nbval + nbneg > 0) {
if (nbval + nbneg > 1) {
str = xmlStrdup(BAD_CAST ". Expected is one of ");
str = xmlStrdup(BAD_CAST ". Expected is one of ( ");
} else
str = xmlStrdup(BAD_CAST ". Expected is ");
str = xmlStrdup(BAD_CAST ". Expected is ( ");
nsName = NULL;
for (i = 0; i < nbval + nbneg; i++) {
@ -1146,9 +1146,7 @@ xmlSchemaVComplexTypeElemErr(xmlSchemaValidCtxtPtr ctxt,
} else {
while ((*end != 0) && (*end != '|'))
end++;
localName = xmlStrcat(localName, BAD_CAST "'");
localName = xmlStrncat(localName, BAD_CAST cur, end - cur);
localName = xmlStrcat(localName, BAD_CAST "'");
}
if (*end != 0) {
*end++;
@ -1187,7 +1185,8 @@ xmlSchemaVComplexTypeElemErr(xmlSchemaValidCtxtPtr ctxt,
if (i < nbval + nbneg -1)
str = xmlStrcat(str, BAD_CAST ", ");
}
}
str = xmlStrcat(str, BAD_CAST " )");
msg = xmlStrcat(msg, BAD_CAST str);
FREE_AND_NULL(str)
}
@ -3162,9 +3161,9 @@ xmlSchemaAddAttribute(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
}
memset(ret, 0, sizeof(xmlSchemaAttribute));
ret->name = xmlDictLookup(ctxt->dict, name, -1);
ret->targetNamespace = xmlDictLookup(ctxt->dict, namespace, -1);
ret->targetNamespace = namespace;
val = xmlHashAddEntry3(schema->attrDecl, name,
schema->targetNamespace, ctxt->container, ret);
namespace, ctxt->container, ret);
if (val != 0) {
xmlSchemaPCustomErr(ctxt,
XML_SCHEMAP_REDEFINED_ATTR,
@ -3269,7 +3268,6 @@ xmlSchemaAddElement(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
}
memset(ret, 0, sizeof(xmlSchemaElement));
ret->name = xmlDictLookup(ctxt->dict, name, -1);
ret->targetNamespace = xmlDictLookup(ctxt->dict, namespace, -1);
val = xmlHashAddEntry3(schema->elemDecl, name,
namespace, ctxt->container, ret);
if (val != 0) {
@ -3394,7 +3392,8 @@ xmlSchemaAddType(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
*/
static xmlSchemaTypePtr
xmlSchemaAddGroup(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
const xmlChar * name, xmlNodePtr node)
const xmlChar *name, const xmlChar *namespaceName,
xmlNodePtr node)
{
xmlSchemaTypePtr ret = NULL;
int val;
@ -3415,7 +3414,7 @@ xmlSchemaAddGroup(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
memset(ret, 0, sizeof(xmlSchemaType));
ret->name = xmlDictLookup(ctxt->dict, name, -1);
val =
xmlHashAddEntry2(schema->groupDecl, name, schema->targetNamespace,
xmlHashAddEntry2(schema->groupDecl, name, namespaceName,
ret);
if (val != 0) {
xmlSchemaPCustomErr(ctxt,
@ -4650,6 +4649,9 @@ xmlSchemaParseAny(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
type->node = node;
type->type = XML_SCHEMA_TYPE_ANY;
/*
* TODO: Use a particle component here.
*/
wildc = xmlSchemaAddWildcard(ctxt);
/*
* Check min/max sanity.
@ -4709,6 +4711,7 @@ xmlSchemaParseNotation(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
if (ret == NULL) {
return (NULL);
}
ret->targetNamespace = schema->targetNamespace;
child = node->children;
if (IS_SCHEMA(child, "annotation")) {
ret->annot = xmlSchemaParseAnnotation(ctxt, schema, child);
@ -4972,7 +4975,7 @@ xmlSchemaParseAttribute(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
return (NULL);
}
ret->type = XML_SCHEMA_TYPE_ATTRIBUTE;
ret->node = node;
ret->node = node;
if (topLevel)
ret->flags |= XML_SCHEMAS_ATTR_GLOBAL;
/*
@ -5178,6 +5181,7 @@ xmlSchemaParseAttributeGroup(xmlSchemaParserCtxtPtr ctxt,
ret->type = XML_SCHEMA_TYPE_ATTRIBUTEGROUP;
ret->flags |= XML_SCHEMAS_ATTRGROUP_GLOBAL;
ret->node = node;
ret->targetNamespace = schema->targetNamespace;
} else {
char buf[50];
const xmlChar *refNs = NULL, *ref = NULL, *refPrefix;
@ -5209,7 +5213,7 @@ xmlSchemaParseAttributeGroup(xmlSchemaParserCtxtPtr ctxt,
/* TODO: Is @refPrefix currently used? */
ret->refPrefix = refPrefix;
ret->node = node;
}
}
/*
* Check for illegal attributes.
*/
@ -5549,7 +5553,8 @@ xmlSchemaParseElement(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
return (NULL);
}
ret->type = XML_SCHEMA_TYPE_ELEMENT;
ret->node = node;
ret->node = node;
ret->targetNamespace = ns;
/*
* Check for illegal attributes.
*/
@ -6068,7 +6073,8 @@ xmlSchemaParseSimpleType(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
attrValue, NULL, NULL, NULL);
}
}
}
}
type->targetNamespace = schema->targetNamespace;
/* TODO: Check id. */
type->id = xmlSchemaGetProp(ctxt, node, "id");
/*
@ -6129,9 +6135,9 @@ xmlSchemaParseGroup(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
{
xmlSchemaTypePtr type, subtype;
xmlNodePtr child = NULL;
const xmlChar *name;
const xmlChar *name, *ns = NULL;
const xmlChar *ref = NULL, *refNs = NULL;
char buf[100];
char buf[50];
int minOccurs, maxOccurs;
if ((ctxt == NULL) || (schema == NULL) || (node == NULL))
@ -6145,6 +6151,8 @@ xmlSchemaParseGroup(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
if ((minOccurs == 0) && (maxOccurs == 0)) {
return (NULL);
}
if (topLevel)
ns = schema->targetNamespace;
name = xmlSchemaGetProp(ctxt, node, "name");
if (name == NULL) {
ref = xmlGetQNameProp(ctxt, node, "ref", &refNs);
@ -6157,16 +6165,16 @@ xmlSchemaParseGroup(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
}
if (refNs == NULL)
refNs = schema->targetNamespace;
snprintf(buf, 99, "anongroup %d", ctxt->counter++ + 1);
snprintf(buf, 49, "#GrRef %d", ctxt->counter++ + 1);
name = (const xmlChar *) buf;
}
type = xmlSchemaAddGroup(ctxt, schema, name, node);
type = xmlSchemaAddGroup(ctxt, schema, name, ns, node);
if (type == NULL)
return (NULL);
type->node = node;
type->type = XML_SCHEMA_TYPE_GROUP;
if (topLevel)
type->flags |= XML_SCHEMAS_TYPE_GLOBAL;
if (topLevel)
type->flags |= XML_SCHEMAS_TYPE_GLOBAL;
type->id = xmlSchemaGetProp(ctxt, node, "id");
type->ref = ref;
type->refNs = refNs;
@ -7995,7 +8003,8 @@ xmlSchemaParseComplexType(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
*/
type->flags |= XML_SCHEMAS_TYPE_FINAL_DEFAULT;
type->flags |= XML_SCHEMAS_TYPE_BLOCK_DEFAULT;
}
}
type->targetNamespace = schema->targetNamespace;
/*
* Handle attributes.
*/
@ -14820,7 +14829,7 @@ xmlSchemaValidateSimpleTypeValue(xmlSchemaValidCtxtPtr ctxt,
* of white space separated tokens, each of which ·match·es a literal
* in the ·lexical space· of {item type definition}
*/
if (value == NULL)
value = BAD_CAST "";
tmpType = xmlSchemaGetListSimpleTypeItemType(type);