lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-08-07 06:43:02 +03:00
Code Activity

Applied patches supplied by Kasimier Buchcik. changed test to account for

Browse Source 
* xmlschemas.c, include/libxml/schemasInternals.h,
  include/libxml/xmlerror.h: Applied patches supplied by
  Kasimier Buchcik.
* test/schemas/po1_0.xml, test/schemas/po1_0.xsd:
  changed test to account for above patch.
This commit is contained in:
William M. Brack
2004-05-11 15:09:58 +00:00
parent b3ac18dce8
commit e709195e35
6 changed files with 768 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
Tue May 11 23:04:47 HKT 2004 William Brack <wbrack@mmm.com.hk>
* xmlschemas.c, include/libxml/schemasInternals.h,
include/libxml/xmlerror.h: Applied patches supplied by
Kasimier Buchcik.
* test/schemas/po1_0.xml, test/schemas/po1_0.xsd:
changed test to account for above patch.
Tue May 11 09:06:53 CEST 2004 Daniel Veillard <daniel@veillard.com> Tue May 11 09:06:53 CEST 2004 Daniel Veillard <daniel@veillard.com>
* python/tests/tstLastError.py: better portability fix for f(*args), * python/tests/tstLastError.py: better portability fix for f(*args),

1
include/libxml/schemasInternals.h
View File

@@ -49,6 +49,7 @@ typedef enum {
XML_SCHEMA_TYPE_NOTATION, XML_SCHEMA_TYPE_NOTATION,
XML_SCHEMA_TYPE_LIST, XML_SCHEMA_TYPE_LIST,
XML_SCHEMA_TYPE_UNION, XML_SCHEMA_TYPE_UNION,
XML_SCHEMA_TYPE_ANY_ATTRIBUTE,
XML_SCHEMA_FACET_MININCLUSIVE = 1000, XML_SCHEMA_FACET_MININCLUSIVE = 1000,
XML_SCHEMA_FACET_MINEXCLUSIVE, XML_SCHEMA_FACET_MINEXCLUSIVE,
XML_SCHEMA_FACET_MAXINCLUSIVE, XML_SCHEMA_FACET_MAXINCLUSIVE,

10
include/libxml/xmlerror.h
View File

@@ -547,8 +547,14 @@ typedef enum {
XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI, /* 1770 */ XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI, /* 1770 */
XML_SCHEMAP_NOT_SCHEMA, /* 1771 */ XML_SCHEMAP_NOT_SCHEMA, /* 1771 */
XML_SCHEMAP_UNKNOWN_MEMBER_TYPE, /* 1772 */ XML_SCHEMAP_UNKNOWN_MEMBER_TYPE, /* 1772 */
XML_SCHEMAP_INVALID_ATTR_USE, /* 1723 */ XML_SCHEMAP_INVALID_ATTR_USE, /* 1773 */
XML_SCHEMAP_RECURSIVE, /* 1724 */ XML_SCHEMAP_RECURSIVE, /* 1774 */
XML_SCHEMAP_SUPERNUMEROUS_LIST_ITEM_TYPE, /* 1775 */
XML_SCHEMAP_INVALID_ATTR_COMBINATION, /* 1776 */
XML_SCHEMAP_INVALID_ATTR_INLINE_COMBINATION, /* 1777 */
XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD, /* 1778 */
XML_SCHEMAP_INVALID_ATTR_NAME, /* 1779 */
XML_SCHEMAP_REF_AND_CONTENT, /* 1780 */
XML_SCHEMAV_NOROOT = 1800, XML_SCHEMAV_NOROOT = 1800,
XML_SCHEMAV_UNDECLAREDELEM, /* 1801 */ XML_SCHEMAV_UNDECLAREDELEM, /* 1801 */
XML_SCHEMAV_NOTTOPLEVEL, /* 1802 */ XML_SCHEMAV_NOTTOPLEVEL, /* 1802 */

67
test/schemas/po1_0.xml
View File

@@ -1,33 +1,34 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<apo:purchaseOrder xmlns:apo="http://www.example.com/PO1" <apo:purchaseOrder xmlns:apo="http://www.example.com/PO1"
orderDate="1999-10-20"> orderDate="1999-10-20">
<shipTo country="US"> <shipTo country="US">
<name>Alice Smith</name> <name>Alice Smith</name>
<street>123 Maple Street</street> <street>123 Maple Street</street>
<city>Mill Valley</city> <city>Mill Valley</city>
<state>CA</state> <state>CA</state>
<zip>90952</zip> <zip>90952</zip>
</shipTo> </shipTo>
<billTo country="US"> <billTo country="US">
<name>Robert Smith</name> <name>Robert Smith</name>
<street>8 Oak Avenue</street> <street>8 Oak Avenue</street>
<city>Old Town</city> <city>Old Town</city>
<state>PA</state> <state>PA</state>
<zip>95819</zip> <zip>95819</zip>
</billTo> </billTo>
<apo:comment>Hurry, my lawn is going wild!</apo:comment> <apo:comment>Hurry, my lawn is going wild!</apo:comment>
<items> <items>
<item partNum="872-AA"> <item partNum="872-AA">
<productName>Lawnmower</productName> <productName>Lawnmower</productName>
<quantity>1</quantity> <quantity>1</quantity>
<USPrice>148.95</USPrice> <USPrice>148.95</USPrice>
<comment>Confirm this is electric</comment> <apo:comment>Confirm this is electric</apo:comment>
</item> </item>
<item partNum="926-AA"> <item partNum="926-AA">
<productName>Baby Monitor</productName> <productName>Baby Monitor</productName>
<quantity>1</quantity> <quantity>1</quantity>
<USPrice>39.98</USPrice> <USPrice>39.98</USPrice>
<shipDate>1999-05-21</shipDate> <shipDate>1999-05-21</shipDate>
</item> </item>
</items> </items>
</apo:purchaseOrder> </apo:purchaseOrder>

127
test/schemas/po1_0.xsd
View File

@@ -1,63 +1,64 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:po="http://www.example.com/PO1" xmlns:po="http://www.example.com/PO1"
targetNamespace="http://www.example.com/PO1" targetNamespace="http://www.example.com/PO1"
elementFormDefault="unqualified" elementFormDefault="unqualified"
attributeFormDefault="unqualified"> attributeFormDefault="unqualified">
<xsd:annotation> <xsd:annotation>
<xsd:documentation xml:lang="en"> <xsd:documentation xml:lang="en">
Purchase order schema for Example.com. Purchase order schema for Example.com.
Copyright 2000 Example.com. All rights reserved. Copyright 2000 Example.com. All rights reserved.
</xsd:documentation> </xsd:documentation>
</xsd:annotation> </xsd:annotation>
<xsd:element name="purchaseOrder" type="po:PurchaseOrderType"/> <xsd:element name="purchaseOrder" type="po:PurchaseOrderType"/>
<xsd:element name="comment" type="xsd:string"/> <xsd:element name="comment" type="xsd:string"/>
<xsd:complexType name="PurchaseOrderType"> <xsd:complexType name="PurchaseOrderType">
<xsd:sequence> <xsd:sequence>
<xsd:element name="shipTo" type="po:USAddress"/> <xsd:element name="shipTo" type="po:USAddress"/>
<xsd:element name="billTo" type="po:USAddress"/> <xsd:element name="billTo" type="po:USAddress"/>
<xsd:element ref="comment" minOccurs="0"/> <xsd:element ref="po:comment" minOccurs="0"/>
<xsd:element name="items" type="po:Items"/> <xsd:element name="items" type="po:Items"/>
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="orderDate" type="xsd:date"/> <xsd:attribute name="orderDate" type="xsd:date"/>
</xsd:complexType> </xsd:complexType>
<xsd:complexType name="USAddress"> <xsd:complexType name="USAddress">
<xsd:sequence> <xsd:sequence>
<xsd:element name="name" type="xsd:string"/> <xsd:element name="name" type="xsd:string"/>
<xsd:element name="street" type="xsd:string"/> <xsd:element name="street" type="xsd:string"/>
<xsd:element name="city" type="xsd:string"/> <xsd:element name="city" type="xsd:string"/>
<xsd:element name="state" type="xsd:string"/> <xsd:element name="state" type="xsd:string"/>
<xsd:element name="zip" type="xsd:decimal"/> <xsd:element name="zip" type="xsd:decimal"/>
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="country" type="xsd:NMTOKEN" fixed="US"/> <xsd:attribute name="country" type="xsd:NMTOKEN" fixed="US"/>
</xsd:complexType> </xsd:complexType>
<xsd:complexType name="Items"> <xsd:complexType name="Items">
<xsd:sequence> <xsd:sequence>
<xsd:element name="item" minOccurs="0" maxOccurs="unbounded"> <xsd:element name="item" minOccurs="0" maxOccurs="unbounded">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="productName" type="xsd:string"/> <xsd:element name="productName" type="xsd:string"/>
<xsd:element name="quantity"> <xsd:element name="quantity">
<xsd:simpleType> <xsd:simpleType>
<xsd:restriction base="xsd:positiveInteger"> <xsd:restriction base="xsd:positiveInteger">
<xsd:maxExclusive value="100"/> <xsd:maxExclusive value="100"/>
</xsd:restriction> </xsd:restriction>
</xsd:simpleType> </xsd:simpleType>
</xsd:element> </xsd:element>
<xsd:element name="USPrice" type="xsd:decimal"/> <xsd:element name="USPrice" type="xsd:decimal"/>
<xsd:element ref="comment" minOccurs="0"/> <xsd:element ref="po:comment" minOccurs="0"/>
<xsd:element name="shipDate" type="xsd:date" minOccurs="0"/> <xsd:element name="shipDate" type="xsd:date" minOccurs="0"/>
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="partNum" type="po:SKU" use="required"/> <xsd:attribute name="partNum" type="po:SKU" use="required"/>
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
</xsd:sequence> </xsd:sequence>
</xsd:complexType> </xsd:complexType>
<!-- Stock Keeping Unit, a code for identifying products --> <!-- Stock Keeping Unit, a code for identifying products -->
<xsd:simpleType name="SKU"> <xsd:simpleType name="SKU">
<xsd:restriction base="xsd:string"> <xsd:restriction base="xsd:string">
<xsd:pattern value="\d{3}-[A-Z]{2}"/> <xsd:pattern value="\d{3}-[A-Z]{2}"/>
</xsd:restriction> </xsd:restriction>
</xsd:simpleType> </xsd:simpleType>
</xsd:schema> </xsd:schema>

820
xmlschemas.c
View File

File diff suppressed because it is too large Load Diff