From 1d913863130a17a638db69c2c50f89e5b0d4aae4 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 21 Nov 2003 00:28:39 +0000 Subject: [PATCH] applied patch from Robert Stepanek to start import os schemas support, * xmlschemas.c: applied patch from Robert Stepanek to start import os schemas support, cleaned up stuff and the patch. * test/schemas/import0_0.* result/schemas/import0_0_0*: added test to regression, fixed a few regressions too. Daniel --- ChangeLog | 7 ++ doc/Makefile.am | 10 +-- result/schemas/import0_0_0 | 1 + result/schemas/import0_0_0.err | 0 result/schemas/length3_0_0.err | 3 +- test/schemas/import0_0.imp | 13 +++ test/schemas/import0_0.xml | 8 ++ test/schemas/import0_0.xsd | 34 +++---- xmlschemas.c | 158 +++++++++++++++++++++++++++++++-- xmlwriter.c | 20 ++++- 10 files changed, 222 insertions(+), 32 deletions(-) create mode 100644 result/schemas/import0_0_0 create mode 100644 result/schemas/import0_0_0.err create mode 100644 test/schemas/import0_0.imp create mode 100644 test/schemas/import0_0.xml diff --git a/ChangeLog b/ChangeLog index 5627e4c4..6780586e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Nov 21 01:26:00 CET 2003 Daniel Veillard + + * xmlschemas.c: applied patch from Robert Stepanek to start + import os schemas support, cleaned up stuff and the patch. + * test/schemas/import0_0.* result/schemas/import0_0_0*: added test + to regression, fixed a few regressions too. + Thu Nov 20 22:58:00 CET 2003 Daniel Veillard * HTMLparser.c: applied two parsing fixes from James Bursa diff --git a/doc/Makefile.am b/doc/Makefile.am index d6f3009e..dd9cdcc2 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -31,9 +31,11 @@ EXTRA_DIST=xmlcatalog_man.xml tutorial/*.html tutorial/*.c tutorial/*.pdf \ man_MANS = xmllint.1 xmlcatalog.1 -all: api web $(top_srcdir)/NEWS libxml2.xsa $(man_MANS) +all: web $(top_srcdir)/NEWS libxml2.xsa $(man_MANS) -web: $(PAGES) $(APIPAGES) $(srcdir)/html/index.html +api: libxml2-api.xml libxml2-refs.xml $(APIPAGES) $(srcdir)/html/index.html $(WIN32_DIR)/libxml2.def.src + +web: $(PAGES) $(PAGES): xml.html site.xsl -@(if [ -x $(bindir)/xsltproc ] ; then \ @@ -69,8 +71,6 @@ $(srcdir)/html/index.html: libxml2-api.xml $(srcdir)/newapi.xsl echo "Validating the resulting XHTML pages" ; \ $(bindir)/xmllint --nonet --valid --noout html/*.html ; fi ); -api: libxml2-api.xml libxml2-refs.xml $(WIN32_DIR)/libxml2.def.src - $(WIN32_DIR)/libxml2.def.src: libxml2-api.xml -@(if [ -x $(bindir)/xsltproc ] ; then \ $(bindir)/xsltproc -o $(WIN32_DIR)/libxml2.def.src \ @@ -91,7 +91,7 @@ clean-local: maintainer-clean-local: clean rm -rf libxml-decl-list.txt libxml-decl.txt -rebuild: api web +rebuild: api all install-data-local: $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) diff --git a/result/schemas/import0_0_0 b/result/schemas/import0_0_0 new file mode 100644 index 00000000..1231800f --- /dev/null +++ b/result/schemas/import0_0_0 @@ -0,0 +1 @@ +./test/schemas/import0_0.xml validates diff --git a/result/schemas/import0_0_0.err b/result/schemas/import0_0_0.err new file mode 100644 index 00000000..e69de29b diff --git a/result/schemas/length3_0_0.err b/result/schemas/length3_0_0.err index d7d80411..048a3c62 100644 --- a/result/schemas/length3_0_0.err +++ b/result/schemas/length3_0_0.err @@ -1,2 +1 @@ -compilation error -Schemas: element size type non-positive-integer not found +./test/schemas/length3_0.xsd:5: element element: Schemas parser error : Schemas: element size type non-positive-integer not found diff --git a/test/schemas/import0_0.imp b/test/schemas/import0_0.imp new file mode 100644 index 00000000..ce446d88 --- /dev/null +++ b/test/schemas/import0_0.imp @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/test/schemas/import0_0.xml b/test/schemas/import0_0.xml new file mode 100644 index 00000000..5ba7e3f0 --- /dev/null +++ b/test/schemas/import0_0.xml @@ -0,0 +1,8 @@ + + + + xy + + diff --git a/test/schemas/import0_0.xsd b/test/schemas/import0_0.xsd index 7976eab6..e973d64e 100644 --- a/test/schemas/import0_0.xsd +++ b/test/schemas/import0_0.xsd @@ -1,17 +1,21 @@ - - + + - + - - - [Some documentation for my schema] - - - - - - - - - + + + + + + + + + + diff --git a/xmlschemas.c b/xmlschemas.c index f64c1b5e..6976cc7f 100644 --- a/xmlschemas.c +++ b/xmlschemas.c @@ -133,6 +133,15 @@ struct _xmlSchemaValidCtxt { xmlSchemaAttrStatePtr attr; }; +/* + * These are the entries in the schemas importSchemas hash table + */ +typedef struct _xmlSchemaImport xmlSchemaImport; +typedef xmlSchemaImport *xmlSchemaImportPtr; +struct _xmlSchemaImport { + const xmlChar *schemaLocation; + xmlSchemaPtr schema; +}; /************************************************************************ * * @@ -397,6 +406,23 @@ xmlSchemaFreeAnnot(xmlSchemaAnnotPtr annot) xmlFree(annot); } +/** + * xmlSchemaFreeImport: + * @import: a schema import structure + * + * Deallocate an import structure + */ +static void +xmlSchemaFreeImport(xmlSchemaImportPtr import) +{ + if (import == NULL) + return; + + xmlSchemaFree(import->schema); + xmlFree((xmlChar *) import->schemaLocation); + xmlFree(import); +} + /** * xmlSchemaFreeNotation: * @schema: a schema notation structure @@ -522,6 +548,8 @@ xmlSchemaFreeType(xmlSchemaTypePtr type) return; if (type->name != NULL) xmlFree((xmlChar *) type->name); + if (type->ref != NULL) + xmlFree((xmlChar *) type->ref); if (type->base != NULL) xmlFree((xmlChar *) type->base); if (type->baseNs != NULL) @@ -577,6 +605,9 @@ xmlSchemaFree(xmlSchemaPtr schema) if (schema->groupDecl != NULL) xmlHashFree(schema->groupDecl, (xmlHashDeallocator) xmlSchemaFreeType); + if (schema->schemasImports != NULL) + xmlHashFree(schema->schemasImports, + (xmlHashDeallocator) xmlSchemaFreeImport); if (schema->annot != NULL) xmlSchemaFreeAnnot(schema->annot); if (schema->doc != NULL) @@ -845,6 +876,7 @@ xmlSchemaGetType(xmlSchemaPtr schema, const xmlChar * name, const xmlChar * namespace) { xmlSchemaTypePtr ret; + xmlSchemaImportPtr import; if (name == NULL) return (NULL); @@ -854,6 +886,11 @@ xmlSchemaGetType(xmlSchemaPtr schema, const xmlChar * name, return (ret); } ret = xmlSchemaGetPredefinedType(name, namespace); + if (ret != NULL) + return (ret); + import = xmlHashLookup(schema->schemasImports, namespace); + if (import != NULL) + ret = xmlSchemaGetType(import->schema, name, namespace); #ifdef DEBUG if (ret == NULL) { if (namespace == NULL) @@ -2216,8 +2253,10 @@ xmlSchemaParseGroup(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, name = xmlStrdup((xmlChar *) buf); } type = xmlSchemaAddGroup(ctxt, schema, name); + xmlFree(name); if (type == NULL) return (NULL); + type->node = node; type->type = XML_SCHEMA_TYPE_GROUP; type->id = xmlGetProp(node, BAD_CAST "id"); @@ -2318,6 +2357,63 @@ xmlSchemaParseAll(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, return (type); } +/** + * xmlSchemaImportSchema + * + * @ctxt: a schema validation context + * @schemaLocation: an URI defining where to find the imported schema + * + * import a XML schema + * *WARNING* this interface is highly subject to change + * + * Returns -1 in case of error and 1 in case of success. + */ +static xmlSchemaImportPtr +xmlSchemaImportSchema(xmlSchemaParserCtxtPtr ctxt, + const xmlChar *schemaLocation) +{ + xmlSchemaImportPtr import; + xmlSchemaParserCtxtPtr newctxt; + + newctxt = xmlSchemaNewParserCtxt((const char *) schemaLocation); + if (newctxt == NULL) { + xmlSchemaPErrMemory(NULL, "allocating parser context", + NULL); + return (NULL); + } + xmlSchemaSetParserErrors(newctxt, ctxt->error, ctxt->warning, + ctxt->userData); + + import = (xmlSchemaImport*) xmlMalloc(sizeof(xmlSchemaImport)); + if (import == NULL) { + xmlSchemaPErrMemory(NULL, "allocating imported schema", + NULL); + xmlSchemaFreeParserCtxt(newctxt); + return (NULL); + } + + memset(import, 0, sizeof(xmlSchemaImport)); + import->schemaLocation = xmlStrdup(schemaLocation); + import->schema = xmlSchemaParse(newctxt); + + if (import->schema == NULL) { + /* FIXME use another error enum here ? */ + xmlSchemaPErr(ctxt, NULL, XML_SCHEMAS_ERR_INTERNAL, + "failed to import schema at location %s\n", + schemaLocation, NULL); + + xmlSchemaFreeParserCtxt(newctxt); + if (import->schemaLocation != NULL) + xmlFree((xmlChar *)import->schemaLocation); + xmlFree(import); + return NULL; + } + + xmlSchemaFreeParserCtxt(newctxt); + return import; +} + + /** * xmlSchemaParseImport: * @ctxt: a schema validation context @@ -2335,11 +2431,13 @@ xmlSchemaParseImport(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, xmlNodePtr node) { xmlNodePtr child = NULL; + xmlSchemaImportPtr import = NULL; xmlChar *namespace; xmlChar *schemaLocation; - xmlChar *previous; + const xmlChar *previous; xmlURIPtr check; + if ((ctxt == NULL) || (schema == NULL) || (node == NULL)) return (-1); @@ -2359,6 +2457,8 @@ xmlSchemaParseImport(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, } schemaLocation = xmlGetProp(node, BAD_CAST "schemaLocation"); if (schemaLocation != NULL) { + xmlChar *base = NULL; + xmlChar *URI = NULL; check = xmlParseURI((const char *) schemaLocation); if (check == NULL) { xmlSchemaPErr2(ctxt, node, child, @@ -2372,6 +2472,17 @@ xmlSchemaParseImport(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, } else { xmlFreeURI(check); } + base = xmlNodeGetBase(node->doc, node); + if (base == NULL) { + URI = xmlBuildURI(schemaLocation, node->doc->URL); + } else { + URI = xmlBuildURI(schemaLocation, base); + } + if (base != NULL) xmlFree(base); + if (URI != NULL) { + xmlFree(schemaLocation); + schemaLocation = URI; + } } if (schema->schemasImports == NULL) { schema->schemasImports = xmlHashCreate(10); @@ -2388,8 +2499,13 @@ xmlSchemaParseImport(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, } } if (namespace == NULL) { - previous = xmlHashLookup(schema->schemasImports, - XML_SCHEMAS_DEFAULT_NAMESPACE); + import = xmlHashLookup(schema->schemasImports, + XML_SCHEMAS_DEFAULT_NAMESPACE); + if (import != NULL) + previous = import->schemaLocation; + else + previous = NULL; + if (schemaLocation != NULL) { if (previous != NULL) { if (!xmlStrEqual(schemaLocation, previous)) { @@ -2399,13 +2515,27 @@ xmlSchemaParseImport(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, schemaLocation, NULL); } } else { + import = xmlSchemaImportSchema(ctxt, schemaLocation); + if (import == NULL) { + if (schemaLocation != NULL) + xmlFree(schemaLocation); + if (namespace != NULL) + xmlFree(namespace); + return (-1); + } xmlHashAddEntry(schema->schemasImports, XML_SCHEMAS_DEFAULT_NAMESPACE, - schemaLocation); + import); } + xmlFree(schemaLocation); } } else { - previous = xmlHashLookup(schema->schemasImports, namespace); + import = xmlHashLookup(schema->schemasImports, namespace); + if (import != NULL) + previous = import->schemaLocation; + else + previous = NULL; + if (schemaLocation != NULL) { if (previous != NULL) { if (!xmlStrEqual(schemaLocation, previous)) { @@ -2415,11 +2545,22 @@ xmlSchemaParseImport(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, namespace, schemaLocation); } } else { + import = xmlSchemaImportSchema(ctxt, schemaLocation); + if (import == NULL) { + if (schemaLocation != NULL) + xmlFree(schemaLocation); + if (namespace != NULL) + xmlFree(namespace); + return (-1); + } xmlHashAddEntry(schema->schemasImports, - namespace, schemaLocation); + namespace, import); } } + xmlFree(namespace); } + if (schemaLocation != NULL) + xmlFree(schemaLocation); child = node->children; while (IS_SCHEMA(child, "annotation")) { @@ -4271,6 +4412,7 @@ xmlSchemaParse(xmlSchemaParserCtxtPtr ctxt) xmlSchemaPErr(ctxt, (xmlNodePtr) doc, XML_SCHEMAP_NOROOT, "schemas has no root", NULL, NULL); + xmlFreeDoc(doc); return (NULL); } @@ -4338,8 +4480,10 @@ xmlSchemaParse(xmlSchemaParserCtxtPtr ctxt) * Then do the parsing for good */ ret = xmlSchemaParseSchema(ctxt, root); - if (ret == NULL) + if (ret == NULL) { + xmlFreeDoc(doc); return (NULL); + } ret->doc = doc; /* diff --git a/xmlwriter.c b/xmlwriter.c index e81eae0f..fb5acb47 100644 --- a/xmlwriter.c +++ b/xmlwriter.c @@ -217,7 +217,8 @@ xmlNewTextWriterMemory(xmlBufferPtr buf, int compression ATTRIBUTE_UNUSED) * Returns the new xmlTextWriterPtr or NULL in case of error */ xmlTextWriterPtr -xmlNewTextWriterPushParser(xmlParserCtxtPtr ctxt, int compression) +xmlNewTextWriterPushParser(xmlParserCtxtPtr ctxt, + int compression ATTRIBUTE_UNUSED) { xmlTextWriterPtr ret; xmlOutputBufferPtr out; @@ -273,7 +274,7 @@ xmlNewTextWriterDoc(xmlDocPtr * doc, int compression) return NULL; } - ctxt->myDoc = xmlNewDoc(XML_DEFAULT_VERSION); + ctxt->myDoc = xmlNewDoc(BAD_CAST XML_DEFAULT_VERSION); if (ctxt->myDoc == NULL) { xmlFreeParserCtxt(ctxt); xmlGenericError(xmlGenericErrorContext, @@ -552,6 +553,7 @@ xmlTextWriterEndDocument(xmlTextWriterPtr writer) * xmlTextWriterWriteFormatComment: * @writer: the xmlTextWriterPtr * @format: format string (see printf) + * @...: extra parameters for the format * * Write an xml comment. * @@ -929,6 +931,7 @@ xmlTextWriterFullEndElement(xmlTextWriterPtr writer) * xmlTextWriterWriteFormatRaw: * @writer: the xmlTextWriterPtr * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted raw xml text. * @@ -1066,6 +1069,7 @@ xmlTextWriterWriteRaw(xmlTextWriterPtr writer, const xmlChar * content) * xmlTextWriterWriteFormatString: * @writer: the xmlTextWriterPtr * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted xml text. * @@ -1644,6 +1648,7 @@ xmlTextWriterEndAttribute(xmlTextWriterPtr writer) * @writer: the xmlTextWriterPtr * @name: attribute name * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted xml attribute. * @@ -1738,6 +1743,7 @@ xmlTextWriterWriteAttribute(xmlTextWriterPtr writer, const xmlChar * name, * @name: attribute local name * @namespaceURI: namespace URI * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted xml attribute.with namespace support * @@ -1859,6 +1865,7 @@ xmlTextWriterWriteAttributeNS(xmlTextWriterPtr writer, * @writer: the xmlTextWriterPtr * @name: element name * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted xml element. * @@ -1953,6 +1960,7 @@ xmlTextWriterWriteElement(xmlTextWriterPtr writer, const xmlChar * name, * @name: element local name * @namespaceURI: namespace URI * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted xml element with namespace support. * @@ -2193,6 +2201,7 @@ xmlTextWriterEndPI(xmlTextWriterPtr writer) * @writer: the xmlTextWriterPtr * @target: PI target * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted PI. * @@ -2401,6 +2410,7 @@ xmlTextWriterEndCDATA(xmlTextWriterPtr writer) * xmlTextWriterWriteFormatCDATA: * @writer: the xmlTextWriterPtr * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted xml CDATA. * @@ -2655,6 +2665,7 @@ xmlTextWriterEndDTD(xmlTextWriterPtr writer) * @pubid: the public identifier, which is an alternative to the system identifier * @sysid: the system identifier, which is the URI of the DTD * @format: format string (see printf) + * @...: extra parameters for the format * * Write a DTD with a formatted markup declarations part. * @@ -2840,6 +2851,7 @@ xmlTextWriterStartDTDElement(xmlTextWriterPtr writer, const xmlChar * name) * @writer: the xmlTextWriterPtr * @name: the name of the DTD element * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted DTD element. * @@ -3024,6 +3036,7 @@ xmlTextWriterStartDTDAttlist(xmlTextWriterPtr writer, const xmlChar * name) * @writer: the xmlTextWriterPtr * @name: the name of the DTD ATTLIST * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted DTD ATTLIST. * @@ -3219,6 +3232,7 @@ xmlTextWriterStartDTDEntity(xmlTextWriterPtr writer, * @pe: TRUE if this is a parameter entity, FALSE if not * @name: the name of the DTD entity * @format: format string (see printf) + * @...: extra parameters for the format * * Write a formatted DTD internal entity. * @@ -3795,7 +3809,7 @@ xmlTextWriterWriteDocCallback(void *context, const xmlChar * str, int len) xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) context; int rc; - if ((rc = xmlParseChunk(ctxt, str, len, 0)) != 0) { + if ((rc = xmlParseChunk(ctxt, (const char *) str, len, 0)) != 0) { xmlGenericError(xmlGenericErrorContext, "xmlTextWriterWriteDocCallback : XML error %d !\n", rc);