mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00533
[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 263: Corrected several syntax errors.
------------------------------------------------------------
revno: 263
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Sun 2012-06-03 13:06:09 -0300
message:
Corrected several syntax errors.
modified:
schemas/ccd.xsd
schemas/common.xsd
schemas/datatypes.xsd
schemas/metadata.xsd
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 'schemas/ccd.xsd'
--- schemas/ccd.xsd 2012-06-01 18:12:06 +0000
+++ schemas/ccd.xsd 2012-06-03 16:06:09 +0000
@@ -8,13 +8,12 @@
<xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/structures.xsd"/>
<xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/content.xsd"/>
-
+ <xs:element name="ccd" type="mlhim2:CCD"/>
+
<xs:complexType name="CCD">
- <xs:complexContent>
- <xs:sequence>
+ <xs:sequence>
<xs:element name="definition" type="mlhim2:Locatable"/>
- </xs:sequence>
- </xs:complexContent>
+ </xs:sequence>
</xs:complexType>
</xs:schema>
=== modified file 'schemas/common.xsd'
--- schemas/common.xsd 2012-05-29 20:52:18 +0000
+++ schemas/common.xsd 2012-06-03 16:06:09 +0000
@@ -3,8 +3,6 @@
<xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/structures.xsd"/>
<xs:complexType name="FeederAudit">
- <xs:complexContent>
- <xs:extension base="xs:simpleAnyType">
<xs:sequence>
<xs:element maxOccurs="1" minOccurs="1" name="originating_system_audit" type="mlhim2:FeederAuditDetails"/>
<xs:element maxOccurs="unbounded" minOccurs="1" name="originating_system_ids" type="mlhim2:DvIdentifier"/>
@@ -12,13 +10,9 @@
<xs:element maxOccurs="unbounded" minOccurs="1" name="feeder_system_ids" type="mlhim2:DvIdentifier"/>
<xs:element maxOccurs="1" minOccurs="1" name="original_content" type="mlhim2:DvParsable"/>
</xs:sequence>
- </xs:extension>
- </xs:complexContent>
</xs:complexType>
<xs:complexType name="FeederAuditDetails">
- <xs:complexContent>
- <xs:extension base="xs:simpleAnyType">
<xs:sequence>
<xs:element name="system_id" type="mlhim2:DvIdentifier"/>
<xs:element name="provider" type="mlhim2:PartyIdentified"/>
@@ -27,18 +21,12 @@
<xs:element name="subject" type="mlhim2:PartyProxy"/>
<xs:element name="version_id" type="xs:string"/>
</xs:sequence>
- </xs:extension>
- </xs:complexContent>
</xs:complexType>
<xs:complexType abstract="true" name="Locatable">
- <xs:complexContent>
- <xs:extension base="xs:simpleAnyType">
<xs:sequence>
<xs:element name="feeder_audit" type="mlhim2:FeederAudit"/>
</xs:sequence>
- </xs:extension>
- </xs:complexContent>
</xs:complexType>
<xs:complexType name="Attestation">
@@ -57,8 +45,6 @@
</xs:complexType>
<xs:complexType name="Participation">
- <xs:complexContent>
- <xs:extension base="xs:simpleAnyType">
<xs:sequence>
<xs:element maxOccurs="1" minOccurs="1" name="performer" type="mlhim2:PartyProxy"/>
<xs:element maxOccurs="1" minOccurs="1" name="function" type="mlhim2:DvCodedString"/>
@@ -66,8 +52,6 @@
<xs:element name="start_time" type="mlhim2:DvDateTime"/>
<xs:element name="end_time" type="mlhim2:DvDateTime"/>
</xs:sequence>
- </xs:extension>
- </xs:complexContent>
</xs:complexType>
@@ -75,7 +59,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:Locatable">
<xs:sequence>
- <xs:element name="external_ref" type="mlhim2DvURI"/>
+ <xs:element name="external_ref" type="mlhim2:DvURI"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -99,14 +83,10 @@
</xs:complexType>
<xs:complexType abstract="true" name="ExceptionalValue">
- <xs:complexContent>
- <xs:extension base="xs:simpleAnyType">
<xs:sequence>
<xs:element fixed="Exceptional Value" name="ev_name" type="xs:string"/>
<xs:element fixed="The value is somehow outside the bounds of what was expected." name="ev_meaning" type="xs:string"/>
</xs:sequence>
- </xs:extension>
- </xs:complexContent>
</xs:complexType>
<xs:complexType name="NI">
@@ -235,7 +215,7 @@
<xs:restriction base="mlhim2:UNK">
<xs:sequence>
<xs:element fixed="Sufficient Quantity" name="ev_name" type="xs:string"/>
- <xs:element fixed="The specific quantity is not known, but is known to non-zero and it is not specified because it makes up the bulk of the material; 'Add 10mg of ingredient X, 50mg of ingredient Y and sufficient quantity of water to 100mL.'" name="ev_meaning" type="xs:string"/>
+ <xs:element fixed="The specific quantity is not known, but is known to non-zero and it is not specified because it makes up the bulk of the material; Add 10mg of ingredient X, 50mg of ingredient Y and sufficient quantity of water to 100mL." name="ev_meaning" type="xs:string"/>
</xs:sequence>
</xs:restriction>
</xs:complexContent>
@@ -296,4 +276,4 @@
</xs:complexContent>
</xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
=== modified file 'schemas/datatypes.xsd'
--- schemas/datatypes.xsd 2012-05-31 14:33:14 +0000
+++ schemas/datatypes.xsd 2012-06-03 16:06:09 +0000
@@ -1,26 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; version="2.3.0">
+<?xml version="1.0" encoding="UTF-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; version="2.3.0">
<xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/common.xsd"/>
<xs:complexType abstract="true" name="DvAny">
- <xs:complexContent>
- <xs:extension base="xs:anySimpleType">
- <xs:sequence>
- <xs:element maxOccurs="1" minOccurs="1" name="name">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:whiteSpace value="collapse"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element maxOccurs="1" minOccurs="0" name="ev" nillable="true" type="mlhim2:ExceptionalValue"/>
- <xs:element maxOccurs="1" minOccurs="0" name="valid_time_begin" nillable="true" type="xs:dateTime"/>
- <xs:element maxOccurs="1" minOccurs="0" name="valid_time_end" nillable="true" type="xs:dateTime"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
+ <xs:sequence>
+ <xs:element maxOccurs="1" minOccurs="0" name="name">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:whiteSpace value="collapse"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element maxOccurs="1" minOccurs="0" name="ev" nillable="true" type="mlhim2:ExceptionalValue"/>
+ <xs:element maxOccurs="1" minOccurs="0" name="valid_time_begin" nillable="true" type="xs:dateTime"/>
+ <xs:element maxOccurs="1" minOccurs="0" name="valid_time_end" nillable="true" type="xs:dateTime"/>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="DvBoolean">
@@ -34,7 +29,7 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
-
+
<xs:complexType name="DvURI">
<xs:complexContent>
<xs:restriction base="mlhim2:DvAny">
@@ -44,7 +39,7 @@
</xs:restriction>
</xs:complexContent>
</xs:complexType>
-
+
<xs:complexType name="DvString">
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
@@ -56,16 +51,16 @@
</xs:complexContent>
</xs:complexType>
-
+
<xs:complexType name="DvNormalizedString">
<xs:complexContent>
<xs:restriction base="mlhim2:DvString">
<xs:sequence>
<xs:element maxOccurs="1" minOccurs="0" name="string_dv">
- <xs:simpleType>
- <xs:restriction base="xs:normalizedString"></xs:restriction>
- </xs:simpleType>
- </element>
+ <xs:simpleType>
+ <xs:restriction base="xs:normalizedString"/>
+ </xs:simpleType>
+ </xs:element>
</xs:sequence>
</xs:restriction>
</xs:complexContent>
@@ -286,7 +281,7 @@
<xs:complexContent>
<xs:restriction base="mlhim2:DvTemporal">
<xs:sequence>
- <xs:element name="temporal_dv" type="xs:datetime"/>
+ <xs:element name="temporal_dv" type="xs:dateTime"/>
</xs:sequence>
</xs:restriction>
</xs:complexContent>
@@ -312,4 +307,4 @@
</xs:complexContent>
</xs:complexType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
=== modified file 'schemas/metadata.xsd'
--- schemas/metadata.xsd 2012-05-29 20:52:18 +0000
+++ schemas/metadata.xsd 2012-06-03 16:06:09 +0000
@@ -5,35 +5,23 @@
<xs:element name="MetadataEntry" type="mlhim2:MetadataEntry"/>
<xs:complexType name="Metadata">
- <xs:complexContent>
- <xs:extension base="xs:simpleAnyType">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="2" name="content" type="mlhim2:MetadataSet"/>
</xs:sequence>
- </xs:extension>
- </xs:complexContent>
</xs:complexType>
<xs:complexType name="MetadataSet">
- <xs:complexContent>
- <xs:extension base="xs:simpleAnyType">
<xs:sequence>
<xs:element maxOccurs="1" minOccurs="1" name="name" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="1" name="entries" type="mlhim2:MetadataEntry"/>
</xs:sequence>
- </xs:extension>
- </xs:complexContent>
</xs:complexType>
<xs:complexType name="MetadataEntry">
- <xs:complexContent>
- <xs:extension base="xs:simpleAnyType">
- <xs:sequence>
+ <xs:sequence>
<xs:element maxOccurs="1" minOccurs="1" name="name" type="xs:string"/>
<xs:element name="contents" type="xs:string"/>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
+ </xs:sequence>
</xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
=== modified file 'schemas/structures.xsd'
--- schemas/structures.xsd 2012-05-29 20:52:18 +0000
+++ schemas/structures.xsd 2012-06-03 16:06:09 +0000
@@ -8,6 +8,7 @@
</xs:complexContent>
</xs:complexType>
+
<xs:complexType name="Slot">
<xs:complexContent>
<xs:extension base="mlhim2:Item">
