mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00116
[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 105: Corrected several errors. Schemas now pass PyXB parsing for Python bindings
------------------------------------------------------------
revno: 105
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Thu 2011-04-21 17:16:59 -0500
message:
Corrected several errors. Schemas now pass PyXB parsing for Python bindings
modified:
specs/2.0.x/mlhim/schemas/common.xsd
specs/2.0.x/mlhim/schemas/constraint.xsd
specs/2.0.x/mlhim/schemas/content.xsd
specs/2.0.x/mlhim/schemas/datatypes.xsd
specs/2.0.x/mlhim/schemas/entity.xsd
specs/2.0.x/mlhim/schemas/structures.xsd
--
lp:mlhim-specs
https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/main
Your team MLHIM Specifications Developers is subscribed to branch lp:mlhim-specs.
To unsubscribe from this branch go to https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/main/+edit-subscription
=== modified file 'specs/2.0.x/mlhim/schemas/common.xsd'
--- specs/2.0.x/mlhim/schemas/common.xsd 2011-04-20 17:51:52 +0000
+++ specs/2.0.x/mlhim/schemas/common.xsd 2011-04-21 22:16:59 +0000
@@ -1,15 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2011 Timothy W. Cook and Contributors. See http://www.mlhim.org-->
<xs:schema elementFormDefault="qualified" id="common" targetNamespace="http://www.mlhim.org/mlhim2"; version="2.0.0" xmlns:mlhim2="http://www.mlhim.org/mlhim2"; xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <xs:include schemaLocation="support.xsd"></xs:include>
- <xs:include schemaLocation="datatypes.xsd"></xs:include>
- <xs:include schemaLocation="content.xsd"></xs:include>
- <xs:include schemaLocation="entity.xsd"></xs:include>
-
- <xs:simpleType name="idList">
- <xs:list itemType="mlhim2:DvIdentifier"></xs:list>
- </xs:simpleType>
-
+
<xs:complexType name="PartyProxy" abstract="true">
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
@@ -32,7 +24,7 @@
<xs:extension base="mlhim2:PartyProxy">
<xs:sequence>
<xs:element name="name" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
- <xs:element name="identifiers" maxOccurs="1" minOccurs="0" type="mlhim2:idList"></xs:element>
+ <xs:element name="identifiers" maxOccurs="unbounded" minOccurs="0" type="mlhim2:DvIdentifier"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -68,9 +60,9 @@
<xs:extension base="mlhim2:DvAny">
<xs:sequence>
<xs:element name="originating_system_audit" maxOccurs="1" minOccurs="1" type="mlhim2:FeederAuditDetails"></xs:element>
- <xs:element name="originating_system_item_ids" maxOccurs="1" minOccurs="1" type="mlhim2:idList"></xs:element>
+ <xs:element name="originating_system_item_ids" maxOccurs="unbounded" minOccurs="1" type="mlhim2:DvIdentifier"></xs:element>
<xs:element name="feeder_system_audit" maxOccurs="1" minOccurs="1" type="mlhim2:FeederAuditDetails"></xs:element>
- <xs:element name="feeder_system_ids" maxOccurs="1" minOccurs="1" type="mlhim2:idList"></xs:element>
+ <xs:element name="feeder_system_ids" maxOccurs="unbounded" minOccurs="1" type="mlhim2:DvIdentifier"></xs:element>
<xs:element name="original_content" maxOccurs="1" minOccurs="1" type="mlhim2:DvEncapsulated"></xs:element>
</xs:sequence>
</xs:extension>
@@ -90,15 +82,11 @@
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="compList">
- <xs:list itemType="mlhim2:Composition"></xs:list>
- </xs:simpleType>
-
<xs:complexType name="Folder" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:Locatable">
<xs:sequence>
- <xs:element name="items" maxOccurs="1" minOccurs="1" type="mlhim2:compList"></xs:element>
+ <xs:element name="items" maxOccurs="unbounded" minOccurs="1" type="mlhim2:Composition"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -147,7 +135,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
<xs:sequence>
- <xs:element name="language" maxOccurs="1" minOccurs="0" type="xs:lang"></xs:element>
+ <xs:element name="language" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
<xs:element name="locales" maxOccurs="1" minOccurs="0" type="mlhim2:Folder"></xs:element>
<xs:element name="description" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
<xs:element name="contributor" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
=== modified file 'specs/2.0.x/mlhim/schemas/constraint.xsd'
--- specs/2.0.x/mlhim/schemas/constraint.xsd 2011-04-20 17:51:52 +0000
+++ specs/2.0.x/mlhim/schemas/constraint.xsd 2011-04-21 22:16:59 +0000
@@ -1,21 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2011 Timothy W. Cook and Contributors. See http://www.mlhim.org-->
<xs:schema elementFormDefault="qualified" id="constraint" targetNamespace="http://www.mlhim.org/mlhim2"; version="2.0.0" xmlns:mlhim2="http://www.mlhim.org/mlhim2"; xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <xs:include schemaLocation="support.xsd"></xs:include>
- <xs:include schemaLocation="datatypes.xsd"></xs:include>
- <xs:include schemaLocation="common.xsd"></xs:include>
-
- <xs:simpleType name="uuidList">
- <xs:list itemType="xs:string"></xs:list>
- </xs:simpleType>
-
-
+
<xs:complexType name="Ontology" abstract="false">
<xs:sequence>
- <xs:element name="names" maxOccurs="1" minOccurs="1" type="mlhim2:uuidList"></xs:element>
- <xs:element name="internalVocabularies" maxOccurs="1" minOccurs="1" type="mlhim2:uuidList"></xs:element>
- <xs:element name="lookupTables" maxOccurs="1" minOccurs="1" type="mlhim2:uuidList"></xs:element>
- <xs:element name="terminologies" maxOccurs="1" minOccurs="1" type="mlhim2:uuidList"></xs:element>
+ <xs:element name="names" maxOccurs="unbounded" minOccurs="1" type="xs:string"></xs:element>
+ <xs:element name="internalVocabularies" maxOccurs="unbounded" minOccurs="1" type="xs:string"></xs:element>
+ <xs:element name="lookupTables" maxOccurs="unbounded" minOccurs="1" type="xs:string"></xs:element>
+ <xs:element name="terminologies" maxOccurs="unbounded" minOccurs="1" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
=== modified file 'specs/2.0.x/mlhim/schemas/content.xsd'
--- specs/2.0.x/mlhim/schemas/content.xsd 2011-04-20 17:51:52 +0000
+++ specs/2.0.x/mlhim/schemas/content.xsd 2011-04-21 22:16:59 +0000
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2011 Timothy W. Cook and Contributors. See http://www.mlhim.org-->
<xs:schema elementFormDefault="qualified" id="content" targetNamespace="http://www.mlhim.org/mlhim2"; version="2.0.0" xmlns:mlhim2="http://www.mlhim.org/mlhim2"; xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <xs:include schemaLocation="support.xsd"></xs:include>
- <xs:include schemaLocation="datatypes.xsd"></xs:include>
- <xs:include schemaLocation="entity.xsd"></xs:include>
- <xs:include schemaLocation="common.xsd"></xs:include>
-
+
<xs:complexType name="EventContext" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:Locatable">
@@ -22,49 +18,36 @@
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="linksList">
- <xs:list itemType="mlhim2:Link"></xs:list>
- </xs:simpleType>
-
-
<xs:complexType name="ContentItem" abstract="true">
<xs:complexContent>
<xs:extension base="mlhim2:Locatable">
<xs:sequence>
- <xs:element name="links" maxOccurs="1" minOccurs="0" type="mlhim2:linksList"></xs:element>
+ <xs:element name="links" maxOccurs="unbounded" minOccurs="0" type="mlhim2:Link"></xs:element>
<xs:element name="attestation" maxOccurs="1" minOccurs="0" type="mlhim2:Attestation"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="contentList">
- <xs:list itemType="mlhim2:ContentItem"></xs:list>
- </xs:simpleType>
-
<xs:complexType name="Section" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:ContentItem">
<xs:sequence>
- <xs:element name="items" maxOccurs="1" minOccurs="0" type="mlhim2:contentList"></xs:element>
+ <xs:element name="items" maxOccurs="1" minOccurs="0" type="mlhim2:ContentItem"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="partList">
- <xs:list itemType="mlhim2:Participation"></xs:list>
- </xs:simpleType>
-
<xs:complexType name="Entry" abstract="true">
<xs:complexContent>
<xs:extension base="mlhim2:ContentItem">
<xs:sequence>
- <xs:element name="language" maxOccurs="1" minOccurs="0" type="xs:lang"></xs:element>
- <xs:element name="encoding" maxOccurs="1" minOccurs="0" type="xs:lang"></xs:element>
- <xs:element name="subject" maxOccurs="1" minOccurs="0" type="xs:lang"></xs:element>
+ <xs:element name="language" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
+ <xs:element name="encoding" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
+ <xs:element name="subject" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
<xs:element name="provider" maxOccurs="1" minOccurs="0" type="mlhim2:PartyProxy"></xs:element>
- <xs:element name="other_participations" maxOccurs="1" minOccurs="0" type="mlhim2:partList"></xs:element>
+ <xs:element name="other_participations" maxOccurs="unbounded" minOccurs="0" type="mlhim2:Participation"></xs:element>
<xs:element name="workflow_id" maxOccurs="1" minOccurs="0" type="mlhim2:ObjectRef"></xs:element>
</xs:sequence>
</xs:extension>
@@ -137,14 +120,14 @@
<xs:extension base="mlhim2:Locatable">
<xs:sequence>
<xs:element name="attestation" maxOccurs="1" minOccurs="0" type="mlhim2:Attestation"></xs:element>
- <xs:element name="links" maxOccurs="1" minOccurs="0" type="mlhim2:linksList"></xs:element>
+ <xs:element name="links" maxOccurs="unbounded" minOccurs="0" type="mlhim2:Link"></xs:element>
<xs:element name="original" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
<xs:element name="predecessor" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
<xs:element name="created" maxOccurs="1" minOccurs="0" type="mlhim2:DvDateTime"></xs:element>
<xs:element name="composer" maxOccurs="1" minOccurs="0" type="mlhim2:PartyProxy"></xs:element>
<xs:element name="territory" maxOccurs="1" minOccurs="0" type="mlhim2:Location"></xs:element>
<xs:element name="category" maxOccurs="1" minOccurs="0" type="mlhim2:DvCodedText"></xs:element>
- <xs:element name="language" maxOccurs="1" minOccurs="0" type="xs:lang"></xs:element>
+ <xs:element name="language" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
<xs:element name="context" maxOccurs="1" minOccurs="0" type="mlhim2:EventContext"></xs:element>
<xs:element name="content" maxOccurs="1" minOccurs="0" type="mlhim2:Locatable"></xs:element>
</xs:sequence>
=== modified file 'specs/2.0.x/mlhim/schemas/datatypes.xsd'
--- specs/2.0.x/mlhim/schemas/datatypes.xsd 2011-04-20 17:51:52 +0000
+++ specs/2.0.x/mlhim/schemas/datatypes.xsd 2011-04-21 22:16:59 +0000
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2011 Timothy W. Cook and Contributors. See http://www.mlhim.org-->
<xs:schema elementFormDefault="qualified" id="datatypes" targetNamespace="http://www.mlhim.org/mlhim2"; version="2.0.0" xmlns:mlhim2="http://www.mlhim.org/mlhim2"; xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <xs:include schemaLocation="support.xsd"></xs:include>
-
+
<xs:complexType name="DvAny" abstract="true">
<xs:sequence>
<xs:element name="valid_time_begin" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
@@ -16,7 +15,7 @@
<xs:extension base="mlhim2:DvAny">
<xs:sequence>
<xs:element name="uuid" maxOccurs="1" minOccurs="1" type="xs:string" nillable="false"></xs:element>
- <xs:element name="language" maxOccurs="1" minOccurs="0" type="xs:language" nillable="true"></xs:element>
+ <xs:element name="language" maxOccurs="1" minOccurs="0" type="xs:string" nillable="true"></xs:element>
<xs:element name="dv" maxOccurs="1" minOccurs="0" type="xs:string" nillable="true"></xs:element>
</xs:sequence>
</xs:extension>
@@ -66,12 +65,12 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
-
+
<xs:complexType name="DvParagraph" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:DvAny" >
<xs:sequence>
- <xs:element name="items" maxOccurs="Unbounded" minOccurs="0" type="mlhim2:DvText" nillable="false"></xs:element>
+ <xs:element name="items" maxOccurs="unbounded" minOccurs="0" type="mlhim2:DvText" nillable="false"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -143,16 +142,12 @@
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="RefRanges">
- <xs:list itemType="mlhim2:ReferenceRange"></xs:list>
- </xs:simpleType>
-
- <xs:complexType name="DvOrdered" abstract="true">
+ <xs:complexType name="DvOrdered" abstract="true">
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
<xs:sequence>
<xs:element name="normal_range" maxOccurs="1" minOccurs="0" type="mlhim2:DvInterval"></xs:element>
- <xs:element name="other_reference_ranges" maxOccurs="unbounded" minOccurs="0" type="mlhim2:RefRanges"></xs:element>
+ <xs:element name="other_reference_ranges" maxOccurs="unbounded" minOccurs="0" type="mlhim2:ReferenceRange"></xs:element>
<xs:element name="normal_status" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
</xs:sequence>
</xs:extension>
@@ -224,17 +219,6 @@
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="DvQuantity" abstract="false">
- <xs:complexContent>
- <xs:extension base="mlhim2:DvQuantified">
- <xs:sequence>
- <xs:element name="units" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
- <xs:element name="precision" maxOccurs="1" minOccurs="0" type="xs:integer"></xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
<xs:complexType name="DvRatio" abstract="true">
<xs:complexContent>
<xs:extension base="mlhim2:DvQuantified">
@@ -246,18 +230,7 @@
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="DvQuantity" abstract="false">
- <xs:complexContent>
- <xs:extension base="mlhim2:DvQuantified">
- <xs:sequence>
- <xs:element name="units" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
- <xs:element name="precision" maxOccurs="1" minOccurs="0" type="xs:integer"></xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:complexType name="DvRate" abstract="false">
+ <xs:complexType name="DvRate" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:DvRatio">
<xs:sequence>
=== modified file 'specs/2.0.x/mlhim/schemas/entity.xsd'
--- specs/2.0.x/mlhim/schemas/entity.xsd 2011-04-20 17:51:52 +0000
+++ specs/2.0.x/mlhim/schemas/entity.xsd 2011-04-21 22:16:59 +0000
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2011 Timothy W. Cook and Contributors. See http://www.mlhim.org-->
<xs:schema elementFormDefault="qualified" id="entity" targetNamespace="http://www.mlhim.org/mlhim2"; version="2.0.0" xmlns:mlhim2="http://www.mlhim.org/mlhim2"; xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <xs:include schemaLocation="support.xsd"></xs:include>
- <xs:include schemaLocation="datatypes.xsd"></xs:include>
- <xs:include schemaLocation="common.xsd"></xs:include>
-
+
<xs:complexType name="Role" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:Locatable">
@@ -29,38 +26,26 @@
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="targetList">
- <xs:list itemType="xs:string"></xs:list>
- </xs:simpleType>
-
<xs:complexType name="Relationship" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:Locatable">
<xs:sequence>
- <xs:element name="targets" maxOccurs="1" minOccurs="0" type="mlhim2:targetList"></xs:element>
+ <xs:element name="targets" maxOccurs="unbounded" minOccurs="0" type="xs:string"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="roleList">
- <xs:list itemType="mlhim2:Role"></xs:list>
- </xs:simpleType>
-
- <xs:simpleType name="locationList">
- <xs:list itemType="mlhim2:Location"></xs:list>
- </xs:simpleType>
-
<xs:complexType name="Party" abstract="true">
<xs:complexContent>
<xs:extension base="mlhim2:Locatable" >
<xs:sequence>
- <xs:element name="valid_time_begin" maxOccurs="1" minOccurs="0" type="mlhim2:DvDateTime"></xs:element>
- <xs:element name="valid_time_end" maxOccurs="1" minOccurs="0" type="mlhim2:DvDateTime"></xs:element>
+ <xs:element name="valid_time_begin" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
+ <xs:element name="valid_time_end" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
<xs:element name="ev" maxOccurs="1" minOccurs="0" type="mlhim2:ExceptionalValue"></xs:element>
- <xs:element name="identifiers" maxOccurs="1" minOccurs="0" type="mlhim2:idList"></xs:element>
- <xs:element name="roles" maxOccurs="1" minOccurs="0" type="mlhim2:roleList"></xs:element>
- <xs:element name="locations" maxOccurs="1" minOccurs="0" type="mlhim2:locationList"></xs:element>
+ <xs:element name="identifiers" maxOccurs="unbounded" minOccurs="0" type="mlhim2:DvIdentifier"></xs:element>
+ <xs:element name="roles" maxOccurs="unbounded" minOccurs="0" type="mlhim2:Role"></xs:element>
+ <xs:element name="locations" maxOccurs="unbounded" minOccurs="0" type="mlhim2:Location"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -85,30 +70,22 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
-
- <xs:simpleType name="partyList">
- <xs:list itemType="mlhim2:Party"></xs:list>
- </xs:simpleType>
-
+
<xs:complexType name="Group" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:Party">
<xs:sequence>
- <xs:element name="members" maxOccurs="1" minOccurs="0" type="mlhim2:partyList"></xs:element>
+ <xs:element name="members" maxOccurs="1" minOccurs="0" type="mlhim2:Party"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
-
- <xs:simpleType name="relateList">
- <xs:list itemType="mlhim2:Relationship"></xs:list>
- </xs:simpleType>
-
+
<xs:complexType name="Person" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:Party">
<xs:sequence>
- <xs:element name="relationships" maxOccurs="1" minOccurs="0" type="mlhim2:relateList"></xs:element>
+ <xs:element name="relationships" maxOccurs="unbounded" minOccurs="0" type="mlhim2:Relationship"></xs:element>
<xs:element name="dob" maxOccurs="1" minOccurs="0" type="mlhim2:DvDateTime"></xs:element>
<xs:element name="dob_accurate" maxOccurs="1" minOccurs="0" type="xs:boolean"></xs:element>
</xs:sequence>
=== modified file 'specs/2.0.x/mlhim/schemas/structures.xsd'
--- specs/2.0.x/mlhim/schemas/structures.xsd 2011-04-20 17:51:52 +0000
+++ specs/2.0.x/mlhim/schemas/structures.xsd 2011-04-21 22:16:59 +0000
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2011 Timothy W. Cook and Contributors. See http://www.mlhim.org-->
<xs:schema elementFormDefault="qualified" id="structures" targetNamespace="http://www.mlhim.org/mlhim2"; version="2.0.0" xmlns:mlhim2="http://www.mlhim.org/mlhim2"; xmlns:xs="http://www.w3.org/2001/XMLSchema";>
- <xs:include schemaLocation="support.xsd"></xs:include>
- <xs:include schemaLocation="datatypes.xsd"></xs:include>
- <xs:include schemaLocation="content.xsd"></xs:include>
- <xs:include schemaLocation="common.xsd"></xs:include>
-
+
<xs:complexType name="DataStructure" abstract="true">
<xs:complexContent>
<xs:extension base="mlhim2:Locatable">
@@ -26,7 +22,7 @@
<xs:sequence>
<xs:element name="time" maxOccurs="1" minOccurs="1" type="mlhim2:DvDateTime"></xs:element>
<xs:element name="data" maxOccurs="1" minOccurs="1" type="mlhim2:DvAny"></xs:element>
- <xs:element name="time" maxOccurs="1" minOccurs="1" type="mlhim2:ItemStructure"></xs:element>
+ <xs:element name="details" maxOccurs="1" minOccurs="1" type="mlhim2:ItemStructure"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -77,31 +73,23 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
-
- <xs:simpleType name="itemList">
- <xs:list itemType="mlhim2:Item"></xs:list>
- </xs:simpleType>
-
+
<xs:complexType name="Cluster" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:Item">
<xs:sequence>
- <xs:element name="items" maxOccurs="1" minOccurs="1" type="itemList"></xs:element>
+ <xs:element name="items" maxOccurs="unbounded" minOccurs="1" type="mlhim2:Item"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="eventList">
- <xs:list itemType="mlhim2:Event"></xs:list>
- </xs:simpleType>
-
<xs:complexType name="History" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:DataStructure">
<xs:sequence>
<xs:element name="origin" maxOccurs="1" minOccurs="1" type="mlhim2:DvDateTime"></xs:element>
- <xs:element name="events" maxOccurs="1" minOccurs="1" type="mlhim2:eventList"></xs:element>
+ <xs:element name="events" maxOccurs="unbounded" minOccurs="1" type="mlhim2:Event"></xs:element>
<xs:element name="period" maxOccurs="1" minOccurs="1" type="mlhim2:DvDuration"></xs:element>
<xs:element name="duration" maxOccurs="1" minOccurs="1" type="mlhim2:DvDuration"></xs:element>
<xs:element name="summary" maxOccurs="1" minOccurs="1" type="mlhim2:ItemStructure"></xs:element>
@@ -121,31 +109,21 @@
</xs:complexContent>
</xs:complexType>
- <xs:simpleType name="elementList">
- <xs:list itemType="mlhim2:Element"></xs:list>
- </xs:simpleType>
-
-
<xs:complexType name="ItemList" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:ItemStructure">
<xs:sequence>
- <xs:element name="items" maxOccurs="1" minOccurs="0" type="mlhim2:elementList"></xs:element>
+ <xs:element name="items" maxOccurs="unbounded" minOccurs="0" type="mlhim2:Element"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
-
- <xs:simpleType name="clusterList">
- <xs:list itemType="mlhim2:Cluster"></xs:list>
- </xs:simpleType>
-
<xs:complexType name="ItemTable" abstract="false">
<xs:complexContent>
<xs:extension base="mlhim2:ItemStructure">
<xs:sequence>
- <xs:element name="rows" maxOccurs="1" minOccurs="0" type="mlhim2:clusterList"></xs:element>
+ <xs:element name="rows" maxOccurs="unbounded" minOccurs="0" type="mlhim2:Cluster"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
