diff --git a/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.xsd b/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.xsd
index fb7c6859f..2e9a2729e 100644
--- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.xsd
+++ b/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.xsd
@@ -6,34 +6,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -44,10 +44,10 @@
-
+
@@ -68,13 +68,13 @@
- Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp
- Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp
+ Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp
+ Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp
-
+
The schema corresponding to this document is normative,
with respect to the syntactic constraints it expresses in the
XML Schema language. The documentation (within <documentation> elements)
@@ -83,58 +83,58 @@
-
+
The simpleType element and all of its members are defined
- towards the end of this schema document
+ towards the end of this schema document
-
-
- Get access to the xml: attribute groups for xml:lang
- as declared on 'schema' and 'documentation' below
-
-
+
+
+ Get access to the xml: attribute groups for xml:lang
+ as declared on 'schema' and 'documentation' below
+
+
-
-
- This type is extended by almost all schema types
- to allow attributes from other namespaces to be
- added to user schemas.
-
-
-
-
-
-
-
+
+
+ This type is extended by almost all schema types
+ to allow attributes from other namespaces to be
+ added to user schemas.
+
+
+
+
+
+
+
-
-
- This type is extended by all types which allow annotation
- other than <schema> itself
-
-
-
-
-
-
-
-
-
-
+
+
+ This type is extended by all types which allow annotation
+ other than <schema> itself
+
+
+
+
+
+
+
+
+
+
- This group is for the
- elements which occur freely at the top level of schemas.
- All of their types are based on the "annotated" type by extension.
+ This group is for the
+ elements which occur freely at the top level of schemas.
+ All of their types are based on the "annotated" type by extension.
@@ -143,12 +143,12 @@
-
+
- This group is for the
- elements which can self-redefine (see <redefine> below).
+ This group is for the
+ elements which can self-redefine (see <redefine> below).
@@ -161,7 +161,7 @@
- A utility type, not for public use
+ A utility type, not for public use
@@ -172,7 +172,7 @@
- A utility type, not for public use
+ A utility type, not for public use
@@ -183,12 +183,12 @@
- A utility type, not for public use
+ A utility type, not for public use
- #all or (possibly empty) subset of {extension, restriction}
+ #all or (possibly empty) subset of {extension, restriction}
-
+
@@ -202,7 +202,7 @@
- A utility type, not for public use
+ A utility type, not for public use
@@ -212,15 +212,15 @@
-
+
- A utility type, not for public use
+ A utility type, not for public use
- #all or (possibly empty) subset of {extension, restriction, list, union}
+ #all or (possibly empty) subset of {extension, restriction, list, union}
-
+
@@ -233,7 +233,7 @@
-
+
@@ -276,17 +276,17 @@
-
+
-
+
-
+
@@ -328,8 +328,8 @@
-
- 'complexType' uses this
+
+ 'complexType' uses this
@@ -337,8 +337,8 @@
-
-
+
+
@@ -349,7 +349,7 @@
-
+
@@ -360,7 +360,7 @@
-
+
@@ -384,7 +384,7 @@
-
+
@@ -419,21 +419,21 @@
-
-
-
-
-
- This branch is short for
- <complexContent>
- <restriction base="xs:anyType">
- ...
- </restriction>
- </complexContent>
-
-
-
-
+
+
+
+
+
+ This branch is short for
+ <complexContent>
+ <restriction base="xs:anyType">
+ ...
+ </restriction>
+ </complexContent>
+
+
+
+
@@ -444,15 +444,15 @@
- Will be restricted to required or forbidden
+ Will be restricted to required or forbidden
- Not allowed if simpleContent child is chosen.
- May be overriden by setting on complexContent child.
-
+ Not allowed if simpleContent child is chosen.
+ May be overriden by setting on complexContent child.
+
@@ -460,7 +460,7 @@
-
+
@@ -473,7 +473,7 @@
-
+
@@ -489,7 +489,7 @@
-
+
@@ -502,7 +502,7 @@
-
+
@@ -513,7 +513,7 @@
This choice is added simply to
- make this a valid restriction per the REC
+ make this a valid restriction per the REC
@@ -521,7 +521,7 @@
-
+
@@ -533,7 +533,7 @@
-
+
@@ -546,13 +546,13 @@
-
+
- Overrides any setting on complexType parent.
+ Overrides any setting on complexType parent.
-
+
@@ -566,7 +566,7 @@
This choice is added simply to
- make this a valid restriction per the REC
+ make this a valid restriction per the REC
@@ -583,7 +583,7 @@
- No typeDefParticle group reference
+ No typeDefParticle group reference
@@ -608,7 +608,7 @@
-
+
@@ -616,42 +616,42 @@
-
-
-
+
+
+
A utility type, not for public use
-
+
#all or (possibly empty) subset of {substitution, extension,
restriction}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- The element element can be used either
- at the top level to define an element-type binding globally,
- or within a content model to either reference a globally-defined
- element or type or declare an element-type binding locally.
- The ref form is not allowed at the top level.
+ The element element can be used either
+ at the top level to define an element-type binding globally,
+ or within a content model to either reference a globally-defined
+ element or type or declare an element-type binding locally.
+ The ref form is not allowed at the top level.
@@ -677,7 +677,7 @@
-
+
@@ -698,7 +698,7 @@
-
+
@@ -727,8 +727,8 @@
- group type for explicit groups, named top-level groups and
- group references
+ group type for explicit groups, named top-level groups and
+ group references
@@ -738,7 +738,7 @@
-
+
@@ -802,7 +802,7 @@
- group type for the three kinds of group
+ group type for the three kinds of group
@@ -816,7 +816,7 @@
-
+
@@ -830,22 +830,22 @@
-
+
-
-
-
- This choice with min/max is here to
- avoid a pblm with the Elt:All/Choice/Seq
- Particle derivation constraint
-
-
-
-
+
+
+
+ This choice with min/max is here to
+ avoid a pblm with the Elt:All/Choice/Seq
+ Particle derivation constraint
+
+
+
+
-
-
+
+
restricted max/min
@@ -881,33 +881,33 @@
-
-
-
- Only elements allowed inside
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Only elements allowed inside
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -963,35 +963,35 @@
-
-
+
+
simple type for the value of the 'namespace' attr of
'any' and 'anyAttribute'
-
-
-
+
+
+
Value is
- ##any - - any non-conflicting WFXML/attribute at all
+ ##any - - any non-conflicting WFXML/attribute at all
- ##other - - any non-conflicting WFXML/attribute from
- namespace other than targetNS
+ ##other - - any non-conflicting WFXML/attribute from
+ namespace other than targetNS
- ##local - - any unqualified non-conflicting WFXML/attribute
+ ##local - - any unqualified non-conflicting WFXML/attribute
- one or - - any non-conflicting WFXML/attribute from
- more URI the listed namespaces
- references
- (space separated)
+ one or - - any non-conflicting WFXML/attribute from
+ more URI the listed namespaces
+ references
+ (space separated)
- ##targetNamespace or ##local may appear in the above list, to
- refer to the targetNamespace of the enclosing
- schema or an absent targetNamespace respectively
-
+ ##targetNamespace or ##local may appear in the above list, to
+ refer to the targetNamespace of the enclosing
+ schema or an absent targetNamespace respectively
+
- A utility type, not for public use
+ A utility type, not for public use
@@ -1031,7 +1031,7 @@
-
+
@@ -1115,25 +1115,25 @@
-
-
+
+
A subset of XPath expressions for use
- in selectors
+in selectors
A utility type, not for public
- use
+use
The following pattern is intended to allow XPath
- expressions per the following EBNF:
- Selector ::= Path ( '|' Path )*
- Path ::= ('.//')? Step ( '/' Step )*
- Step ::= '.' | NameTest
- NameTest ::= QName | '*' | NCName ':' '*'
- child:: is also allowed
+ expressions per the following EBNF:
+ Selector ::= Path ( '|' Path )*
+ Path ::= ('.//')? Step ( '/' Step )*
+ Step ::= '.' | NameTest
+ NameTest ::= QName | '*' | NCName ':' '*'
+ child:: is also allowed
@@ -1141,9 +1141,9 @@
-
-
-
+
+
+
@@ -1151,22 +1151,22 @@
-
-
+
+
A subset of XPath expressions for use
- in fields
+in fields
A utility type, not for public
- use
+use
The following pattern is intended to allow XPath
- expressions per the same EBNF as for selector,
- with the following change:
- Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest )
+ expressions per the same EBNF as for selector,
+ with the following change:
+ Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest )
@@ -1174,9 +1174,9 @@
-
-
-
+
+
+
@@ -1194,7 +1194,7 @@
The three kinds of identity constraints, all with
- type of or derived from 'keybase'.
+ type of or derived from 'keybase'.
@@ -1245,55 +1245,55 @@
- A utility type, not for public use
+ A utility type, not for public use
- A public identifier, per ISO 8879
+ A public identifier, per ISO 8879
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1303,12 +1303,12 @@
-
+
- Not the real urType, but as close an approximation as we can
- get in the XML representation
+ Not the real urType, but as close an approximation as we can
+ get in the XML representation
@@ -1316,863 +1316,863 @@
-
-
- First the built-in primitive datatypes. These definitions are for
- information only, the real built-in definitions are magic.
-
-
-
- For each built-in datatype in this schema (both primitive and
- derived) can be uniquely addressed via a URI constructed
- as follows:
- 1) the base URI is the URI of the XML Schema namespace
- 2) the fragment identifier is the name of the datatype
+
+
+ First the built-in primitive datatypes. These definitions are for
+ information only, the real built-in definitions are magic.
+
- For example, to address the int datatype, the URI is:
+
+ For each built-in datatype in this schema (both primitive and
+ derived) can be uniquely addressed via a URI constructed
+ as follows:
+ 1) the base URI is the URI of the XML Schema namespace
+ 2) the fragment identifier is the name of the datatype
- http://www.w3.org/2001/XMLSchema#int
+ For example, to address the int datatype, the URI is:
- Additionally, each facet definition element can be uniquely
- addressed via a URI constructed as follows:
- 1) the base URI is the URI of the XML Schema namespace
- 2) the fragment identifier is the name of the facet
+ http://www.w3.org/2001/XMLSchema#int
- For example, to address the maxInclusive facet, the URI is:
+ Additionally, each facet definition element can be uniquely
+ addressed via a URI constructed as follows:
+ 1) the base URI is the URI of the XML Schema namespace
+ 2) the fragment identifier is the name of the facet
- http://www.w3.org/2001/XMLSchema#maxInclusive
+ For example, to address the maxInclusive facet, the URI is:
- Additionally, each facet usage in a built-in datatype definition
- can be uniquely addressed via a URI constructed as follows:
- 1) the base URI is the URI of the XML Schema namespace
- 2) the fragment identifier is the name of the datatype, followed
- by a period (".") followed by the name of the facet
+ http://www.w3.org/2001/XMLSchema#maxInclusive
- For example, to address the usage of the maxInclusive facet in
- the definition of int, the URI is:
+ Additionally, each facet usage in a built-in datatype definition
+ can be uniquely addressed via a URI constructed as follows:
+ 1) the base URI is the URI of the XML Schema namespace
+ 2) the fragment identifier is the name of the datatype, followed
+ by a period (".") followed by the name of the facet
- http://www.w3.org/2001/XMLSchema#int.maxInclusive
+ For example, to address the usage of the maxInclusive facet in
+ the definition of int, the URI is:
-
-
+ http://www.w3.org/2001/XMLSchema#int.maxInclusive
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- NOTATION cannot be used directly in a schema; rather a type
- must be derived from it by specifying at least one enumeration
- facet whose value is the name of a NOTATION declared in the
- schema.
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- Now the derived primitive types
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ NOTATION cannot be used directly in a schema; rather a type
+ must be derived from it by specifying at least one enumeration
+ facet whose value is the name of a NOTATION declared in the
+ schema.
+
+
+
+
+
+
-
-
+
+ Now the derived primitive types
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
- pattern specifies the content of section 2.12 of XML 1.0e2
- and RFC 3066 (Revised version of RFC 1766).
-
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ pattern specifies the content of section 2.12 of XML 1.0e2
+ and RFC 3066 (Revised version of RFC 1766).
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
- pattern matches production 7 from the XML spec
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ pattern matches production 7 from the XML spec
+
+
+
+
+
-
-
-
-
-
-
+
-
- pattern matches production 5 from the XML spec
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
- pattern matches production 4 from the Namespaces in XML spec
-
+
-
-
-
+
+
+
+
+ pattern matches production 5 from the XML spec
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ pattern matches production 4 from the Namespaces in XML spec
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- A utility type, not for public use
+ A utility type, not for public use
@@ -2185,19 +2185,19 @@
-
-
-
+
+
+
- #all or (possibly empty) subset of {restriction, union, list}
+ #all or (possibly empty) subset of {restriction, union, list}
- A utility type, not for public use
+ A utility type, not for public use
@@ -2219,173 +2219,173 @@
-
-
-
-
-
-
-
-
- Can be restricted to required or forbidden
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Required at the top level
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Forbidden when nested
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ Can be restricted to required or forbidden
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Required at the top level
+
+
+
+
+
+
+
-
-
-
- We should use a substitution group for facets, but
- that's ruled out because it would allow users to
- add their own, which we're not ready for yet.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Forbidden when nested
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
+
-
- base attribute and simpleType child are mutually
- exclusive, but one or other is required
+
+ We should use a substitution group for facets, but
+ that's ruled out because it would allow users to
+ add their own, which we're not ready for yet.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- itemType attribute and simpleType child are mutually
- exclusive, but one or other is required
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
- memberTypes attribute must be non-empty or there must be
- at least one simpleType child
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ base attribute and simpleType child are mutually
+ exclusive, but one or other is required
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ itemType attribute and simpleType child are mutually
+ exclusive, but one or other is required
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ memberTypes attribute must be non-empty or there must be
+ at least one simpleType child
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
@@ -2399,136 +2399,136 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml b/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml
index 01c4bd5c9..96c931232 100644
--- a/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml
+++ b/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml
@@ -8,7 +8,7 @@
AVID.HEX.2000.1\Schemas\standard
XMLSchema.xsd
- 296FA50F21D7AA4F1A646B0906D21C6C
+ 94ED1A93CE3147D01BCB2FC1126255ED
AVID.HEX.2000.1\Schemas\standard
diff --git a/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Schemas/standard/fileIndex.xsd b/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Schemas/standard/fileIndex.xsd
index 59b05a4c8..fa4d9cfd7 100644
--- a/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Schemas/standard/fileIndex.xsd
+++ b/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Schemas/standard/fileIndex.xsd
@@ -68,6 +68,7 @@
+
diff --git a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml
index 6404e015a..88d71e941 100644
--- a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml
+++ b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml
@@ -8,7 +8,7 @@
AVID.TST.4000.1\Schemas\standard
XMLSchema.xsd
- 296FA50F21D7AA4F1A646B0906D21C6C
+ 94ED1A93CE3147D01BCB2FC1126255ED
AVID.TST.4000.1\Schemas\standard
diff --git a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/XMLSchema.xsd b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/XMLSchema.xsd
index fb7c6859f..2e9a2729e 100644
--- a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/XMLSchema.xsd
+++ b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/XMLSchema.xsd
@@ -6,34 +6,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -44,10 +44,10 @@
-
+
@@ -68,13 +68,13 @@
- Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp
- Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp
+ Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp
+ Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp
-
+
The schema corresponding to this document is normative,
with respect to the syntactic constraints it expresses in the
XML Schema language. The documentation (within <documentation> elements)
@@ -83,58 +83,58 @@
-
+
The simpleType element and all of its members are defined
- towards the end of this schema document
+ towards the end of this schema document
-
-
- Get access to the xml: attribute groups for xml:lang
- as declared on 'schema' and 'documentation' below
-
-
+
+
+ Get access to the xml: attribute groups for xml:lang
+ as declared on 'schema' and 'documentation' below
+
+
-
-
- This type is extended by almost all schema types
- to allow attributes from other namespaces to be
- added to user schemas.
-
-
-
-
-
-
-
+
+
+ This type is extended by almost all schema types
+ to allow attributes from other namespaces to be
+ added to user schemas.
+
+
+
+
+
+
+
-
-
- This type is extended by all types which allow annotation
- other than <schema> itself
-
-
-
-
-
-
-
-
-
-
+
+
+ This type is extended by all types which allow annotation
+ other than <schema> itself
+
+
+
+
+
+
+
+
+
+
- This group is for the
- elements which occur freely at the top level of schemas.
- All of their types are based on the "annotated" type by extension.
+ This group is for the
+ elements which occur freely at the top level of schemas.
+ All of their types are based on the "annotated" type by extension.
@@ -143,12 +143,12 @@
-
+
- This group is for the
- elements which can self-redefine (see <redefine> below).
+ This group is for the
+ elements which can self-redefine (see <redefine> below).
@@ -161,7 +161,7 @@
- A utility type, not for public use
+ A utility type, not for public use
@@ -172,7 +172,7 @@
- A utility type, not for public use
+ A utility type, not for public use
@@ -183,12 +183,12 @@
- A utility type, not for public use
+ A utility type, not for public use
- #all or (possibly empty) subset of {extension, restriction}
+ #all or (possibly empty) subset of {extension, restriction}
-
+
@@ -202,7 +202,7 @@
- A utility type, not for public use
+ A utility type, not for public use
@@ -212,15 +212,15 @@
-
+
- A utility type, not for public use
+ A utility type, not for public use
- #all or (possibly empty) subset of {extension, restriction, list, union}
+ #all or (possibly empty) subset of {extension, restriction, list, union}
-
+
@@ -233,7 +233,7 @@
-
+
@@ -276,17 +276,17 @@
-
+
-
+
-
+
@@ -328,8 +328,8 @@
-
- 'complexType' uses this
+
+ 'complexType' uses this
@@ -337,8 +337,8 @@
-
-
+
+
@@ -349,7 +349,7 @@
-
+
@@ -360,7 +360,7 @@
-
+
@@ -384,7 +384,7 @@
-
+
@@ -419,21 +419,21 @@
-
-
-
-
-
- This branch is short for
- <complexContent>
- <restriction base="xs:anyType">
- ...
- </restriction>
- </complexContent>
-
-
-
-
+
+
+
+
+
+ This branch is short for
+ <complexContent>
+ <restriction base="xs:anyType">
+ ...
+ </restriction>
+ </complexContent>
+
+
+
+
@@ -444,15 +444,15 @@
- Will be restricted to required or forbidden
+ Will be restricted to required or forbidden
- Not allowed if simpleContent child is chosen.
- May be overriden by setting on complexContent child.
-
+ Not allowed if simpleContent child is chosen.
+ May be overriden by setting on complexContent child.
+
@@ -460,7 +460,7 @@
-
+
@@ -473,7 +473,7 @@
-
+
@@ -489,7 +489,7 @@
-
+
@@ -502,7 +502,7 @@
-
+
@@ -513,7 +513,7 @@
This choice is added simply to
- make this a valid restriction per the REC
+ make this a valid restriction per the REC
@@ -521,7 +521,7 @@
-
+
@@ -533,7 +533,7 @@
-
+
@@ -546,13 +546,13 @@
-
+
- Overrides any setting on complexType parent.
+ Overrides any setting on complexType parent.
-
+
@@ -566,7 +566,7 @@
This choice is added simply to
- make this a valid restriction per the REC
+ make this a valid restriction per the REC
@@ -583,7 +583,7 @@
- No typeDefParticle group reference
+ No typeDefParticle group reference
@@ -608,7 +608,7 @@
-
+
@@ -616,42 +616,42 @@
-
-
-
+
+
+
A utility type, not for public use
-
+
#all or (possibly empty) subset of {substitution, extension,
restriction}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- The element element can be used either
- at the top level to define an element-type binding globally,
- or within a content model to either reference a globally-defined
- element or type or declare an element-type binding locally.
- The ref form is not allowed at the top level.
+ The element element can be used either
+ at the top level to define an element-type binding globally,
+ or within a content model to either reference a globally-defined
+ element or type or declare an element-type binding locally.
+ The ref form is not allowed at the top level.
@@ -677,7 +677,7 @@
-
+
@@ -698,7 +698,7 @@
-
+
@@ -727,8 +727,8 @@
- group type for explicit groups, named top-level groups and
- group references
+ group type for explicit groups, named top-level groups and
+ group references
@@ -738,7 +738,7 @@
-
+
@@ -802,7 +802,7 @@
- group type for the three kinds of group
+ group type for the three kinds of group
@@ -816,7 +816,7 @@
-
+
@@ -830,22 +830,22 @@
-
+
-
-
-
- This choice with min/max is here to
- avoid a pblm with the Elt:All/Choice/Seq
- Particle derivation constraint
-
-
-
-
+
+
+
+ This choice with min/max is here to
+ avoid a pblm with the Elt:All/Choice/Seq
+ Particle derivation constraint
+
+
+
+
-
-
+
+
restricted max/min
@@ -881,33 +881,33 @@
-
-
-
- Only elements allowed inside
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Only elements allowed inside
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -963,35 +963,35 @@
-
-
+
+
simple type for the value of the 'namespace' attr of
'any' and 'anyAttribute'
-
-
-
+
+
+
Value is
- ##any - - any non-conflicting WFXML/attribute at all
+ ##any - - any non-conflicting WFXML/attribute at all
- ##other - - any non-conflicting WFXML/attribute from
- namespace other than targetNS
+ ##other - - any non-conflicting WFXML/attribute from
+ namespace other than targetNS
- ##local - - any unqualified non-conflicting WFXML/attribute
+ ##local - - any unqualified non-conflicting WFXML/attribute
- one or - - any non-conflicting WFXML/attribute from
- more URI the listed namespaces
- references
- (space separated)
+ one or - - any non-conflicting WFXML/attribute from
+ more URI the listed namespaces
+ references
+ (space separated)
- ##targetNamespace or ##local may appear in the above list, to
- refer to the targetNamespace of the enclosing
- schema or an absent targetNamespace respectively
-
+ ##targetNamespace or ##local may appear in the above list, to
+ refer to the targetNamespace of the enclosing
+ schema or an absent targetNamespace respectively
+
- A utility type, not for public use
+ A utility type, not for public use
@@ -1031,7 +1031,7 @@
-
+
@@ -1115,25 +1115,25 @@
-
-
+
+
A subset of XPath expressions for use
- in selectors
+in selectors
A utility type, not for public
- use
+use
The following pattern is intended to allow XPath
- expressions per the following EBNF:
- Selector ::= Path ( '|' Path )*
- Path ::= ('.//')? Step ( '/' Step )*
- Step ::= '.' | NameTest
- NameTest ::= QName | '*' | NCName ':' '*'
- child:: is also allowed
+ expressions per the following EBNF:
+ Selector ::= Path ( '|' Path )*
+ Path ::= ('.//')? Step ( '/' Step )*
+ Step ::= '.' | NameTest
+ NameTest ::= QName | '*' | NCName ':' '*'
+ child:: is also allowed
@@ -1141,9 +1141,9 @@
-
-
-
+
+
+
@@ -1151,22 +1151,22 @@
-
-
+
+
A subset of XPath expressions for use
- in fields
+in fields
A utility type, not for public
- use
+use
The following pattern is intended to allow XPath
- expressions per the same EBNF as for selector,
- with the following change:
- Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest )
+ expressions per the same EBNF as for selector,
+ with the following change:
+ Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest )
@@ -1174,9 +1174,9 @@
-
-
-
+
+
+
@@ -1194,7 +1194,7 @@
The three kinds of identity constraints, all with
- type of or derived from 'keybase'.
+ type of or derived from 'keybase'.
@@ -1245,55 +1245,55 @@
- A utility type, not for public use
+ A utility type, not for public use
- A public identifier, per ISO 8879
+ A public identifier, per ISO 8879
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1303,12 +1303,12 @@
-
+
- Not the real urType, but as close an approximation as we can
- get in the XML representation
+ Not the real urType, but as close an approximation as we can
+ get in the XML representation
@@ -1316,863 +1316,863 @@
-
-
- First the built-in primitive datatypes. These definitions are for
- information only, the real built-in definitions are magic.
-
-
-
- For each built-in datatype in this schema (both primitive and
- derived) can be uniquely addressed via a URI constructed
- as follows:
- 1) the base URI is the URI of the XML Schema namespace
- 2) the fragment identifier is the name of the datatype
+
+
+ First the built-in primitive datatypes. These definitions are for
+ information only, the real built-in definitions are magic.
+
- For example, to address the int datatype, the URI is:
+
+ For each built-in datatype in this schema (both primitive and
+ derived) can be uniquely addressed via a URI constructed
+ as follows:
+ 1) the base URI is the URI of the XML Schema namespace
+ 2) the fragment identifier is the name of the datatype
- http://www.w3.org/2001/XMLSchema#int
+ For example, to address the int datatype, the URI is:
- Additionally, each facet definition element can be uniquely
- addressed via a URI constructed as follows:
- 1) the base URI is the URI of the XML Schema namespace
- 2) the fragment identifier is the name of the facet
+ http://www.w3.org/2001/XMLSchema#int
- For example, to address the maxInclusive facet, the URI is:
+ Additionally, each facet definition element can be uniquely
+ addressed via a URI constructed as follows:
+ 1) the base URI is the URI of the XML Schema namespace
+ 2) the fragment identifier is the name of the facet
- http://www.w3.org/2001/XMLSchema#maxInclusive
+ For example, to address the maxInclusive facet, the URI is:
- Additionally, each facet usage in a built-in datatype definition
- can be uniquely addressed via a URI constructed as follows:
- 1) the base URI is the URI of the XML Schema namespace
- 2) the fragment identifier is the name of the datatype, followed
- by a period (".") followed by the name of the facet
+ http://www.w3.org/2001/XMLSchema#maxInclusive
- For example, to address the usage of the maxInclusive facet in
- the definition of int, the URI is:
+ Additionally, each facet usage in a built-in datatype definition
+ can be uniquely addressed via a URI constructed as follows:
+ 1) the base URI is the URI of the XML Schema namespace
+ 2) the fragment identifier is the name of the datatype, followed
+ by a period (".") followed by the name of the facet
- http://www.w3.org/2001/XMLSchema#int.maxInclusive
+ For example, to address the usage of the maxInclusive facet in
+ the definition of int, the URI is:
-
-
+ http://www.w3.org/2001/XMLSchema#int.maxInclusive
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- NOTATION cannot be used directly in a schema; rather a type
- must be derived from it by specifying at least one enumeration
- facet whose value is the name of a NOTATION declared in the
- schema.
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- Now the derived primitive types
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ NOTATION cannot be used directly in a schema; rather a type
+ must be derived from it by specifying at least one enumeration
+ facet whose value is the name of a NOTATION declared in the
+ schema.
+
+
+
+
+
+
-
-
+
+ Now the derived primitive types
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
- pattern specifies the content of section 2.12 of XML 1.0e2
- and RFC 3066 (Revised version of RFC 1766).
-
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ pattern specifies the content of section 2.12 of XML 1.0e2
+ and RFC 3066 (Revised version of RFC 1766).
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
- pattern matches production 7 from the XML spec
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ pattern matches production 7 from the XML spec
+
+
+
+
+
-
-
-
-
-
-
+
-
- pattern matches production 5 from the XML spec
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
- pattern matches production 4 from the Namespaces in XML spec
-
+
-
-
-
+
+
+
+
+ pattern matches production 5 from the XML spec
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ pattern matches production 4 from the Namespaces in XML spec
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- A utility type, not for public use
+ A utility type, not for public use
@@ -2185,19 +2185,19 @@
-
-
-
+
+
+
- #all or (possibly empty) subset of {restriction, union, list}
+ #all or (possibly empty) subset of {restriction, union, list}
- A utility type, not for public use
+ A utility type, not for public use
@@ -2219,173 +2219,173 @@
-
-
-
-
-
-
-
-
- Can be restricted to required or forbidden
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Required at the top level
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Forbidden when nested
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ Can be restricted to required or forbidden
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Required at the top level
+
+
+
+
+
+
+
-
-
-
- We should use a substitution group for facets, but
- that's ruled out because it would allow users to
- add their own, which we're not ready for yet.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Forbidden when nested
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
+
-
- base attribute and simpleType child are mutually
- exclusive, but one or other is required
+
+ We should use a substitution group for facets, but
+ that's ruled out because it would allow users to
+ add their own, which we're not ready for yet.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- itemType attribute and simpleType child are mutually
- exclusive, but one or other is required
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
- memberTypes attribute must be non-empty or there must be
- at least one simpleType child
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ base attribute and simpleType child are mutually
+ exclusive, but one or other is required
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ itemType attribute and simpleType child are mutually
+ exclusive, but one or other is required
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ memberTypes attribute must be non-empty or there must be
+ at least one simpleType child
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
@@ -2399,136 +2399,136 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+