mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00508
[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 246: Begin refactoring schemas to use elements instead of all attributes.
------------------------------------------------------------
revno: 246
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Mon 2012-05-28 14:00:32 -0300
message:
Begin refactoring schemas to use elements instead of all attributes.
removed:
schemas/ecore-schemas.zip
added:
attribute-schemas.zip
ecore-schemas.zip
modified:
schemas/ccd.xsd
schemas/datatypes.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
=== added file 'attribute-schemas.zip'
Binary files attribute-schemas.zip 1970-01-01 00:00:00 +0000 and attribute-schemas.zip 2012-05-28 17:00:32 +0000 differ
=== added file 'ecore-schemas.zip'
Binary files ecore-schemas.zip 1970-01-01 00:00:00 +0000 and ecore-schemas.zip 2012-05-28 17:00:32 +0000 differ
=== modified file 'schemas/ccd.xsd'
--- schemas/ccd.xsd 2012-05-25 23:12:21 +0000
+++ schemas/ccd.xsd 2012-05-28 17:00:32 +0000
@@ -9,7 +9,7 @@
<xs:complexType name="CCD">
<xs:complexContent>
<xs:extension base="xs:anySimpleType">
- <xs:attribute name="definition" type="mlhim2:Locatable" use="required" />
+ <xs:element name="definition" type="mlhim2:Locatable" minOccurs="1" maxOccurs="1" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
=== modified file 'schemas/datatypes.xsd'
--- schemas/datatypes.xsd 2012-05-27 11:38:45 +0000
+++ schemas/datatypes.xsd 2012-05-28 17:00:32 +0000
@@ -10,10 +10,12 @@
<xs:complexType abstract="true" name="DvAny">
<xs:complexContent>
<xs:extension base="xs:anySimpleType">
- <xs:attribute name="name" type="xs:string" whitespace="collapse" use="required"/>
- <xs:attribute name="ev" type="mlhim2:ExceptionalValue" maxOccurs="1" minOccurs="0" nillable="true"/>
- <xs:attribute name="valid_time_begin" type="xs:dateTime" maxOccurs="1" minOccurs="0" nillable="true"/>
- <xs:attribute name="valid_time_end" type="xs:dateTime" maxOccurs="1" minOccurs="0" nillable="true"/>
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" whitespace="collapse" maxOccurs="1" minOccurs="1"/>
+ <xs:element name="ev" type="mlhim2:ExceptionalValue" maxOccurs="1" minOccurs="0" nillable="true"/>
+ <xs:element name="valid_time_begin" type="xs:dateTime" maxOccurs="1" minOccurs="0" nillable="true"/>
+ <xs:element name="valid_time_end" type="xs:dateTime" maxOccurs="1" minOccurs="0" nillable="true"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -21,9 +23,11 @@
<xs:complexType name="DvBoolean">
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
- <xs:attribute name="valid_trues" type="xs:string" maxOccurs="unbounded" minOccurs="0"/>
- <xs:attribute name="valid_falses" type="xs:string" maxOccurs="unbounded" minOccurs="0"/>
- <xs:attribute name="bool_dv" type="xs:string"/>
+ <xs:sequence>
+ <xs:element name="valid_trues" type="xs:string" maxOccurs="unbounded" minOccurs="0"/>
+ <xs:element name="valid_falses" type="xs:string" maxOccurs="unbounded" minOccurs="0"/>
+ <xs:element name="bool_dv" type="xs:string"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -31,42 +35,52 @@
<xs:complexType name="DvString">
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
- <xs:attribute name="string_dv" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="language" type="xs:language" maxOccurs="1" minOccurs="0"/>
+ <xs:sequence>
+ <xs:element name="string_dv" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="language" type="xs:language" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="DvURI">
<xs:complexContent>
- <xs:extension base="mlhim2:DvString">
- <xs:attribute name="string_dv" type="xs:anyURI" maxOccurs="1" minOccurs="0"/>
- </xs:extension>
+ <xs:restriction base="mlhim2:DvString">
+ <xs:sequence>
+ <xs:element name="string_dv" type="xs:anyURI" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
+ </xs:restriction>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="DvNormalizedString">
<xs:complexContent>
- <xs:extension base="mlhim2:DvString">
- <xs:attribute name="string_dv" type="xs:normalizedString" maxOccurs="1" minOccurs="0"/>
- </xs:extension>
+ <xs:restriction base="mlhim2:DvString">
+ <xs:sequence>
+ <xs:element name="string_dv" type="xs:normalizedString" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
+ </xs:restriction>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="DvToken">
<xs:complexContent>
- <xs:extension base="mlhim2:DvString">
- <xs:attribute name="string_dv" type="xs:token" maxOccurs="1" minOccurs="0"/>
- </xs:extension>
+ <xs:restriction base="mlhim2:DvString">
+ <xs:sequence>
+ <xs:element name="string_dv" type="xs:token" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
+ </xs:restriction>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="DvCodedString">
<xs:complexContent>
<xs:extension base="mlhim2:DvString">
- <xs:attribute name="terminology_abbrev" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="terminology_name" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="terminology_code" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:sequence>
+ <xs:element name="terminology_abbrev" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="terminology_name" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="terminology_code" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -74,9 +88,11 @@
<xs:complexType name="DvIdentifier">
<xs:complexContent>
<xs:extension base="mlhim2:DvString">
- <xs:attribute name="id_name" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="issuer" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="assignor" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:sequence>
+ <xs:element name="id_name" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="issuer" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="assignor" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -84,9 +100,11 @@
<xs:complexType abstract="true" name="DvEncapsulated">
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
- <xs:attribute name="size" type="xs:int" use="required"/>
- <xs:attribute name="charset" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="language" type="xs:language" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:sequence>
+ <xs:element name="size" type="xs:int" use="required"/>
+ <xs:element name="charset" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="language" type="xs:language" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -94,8 +112,10 @@
<xs:complexType name="DvParsable">
<xs:complexContent>
<xs:extension base="mlhim2:DvEncapsulated">
- <xs:attribute name="parsable_dv" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="formalism" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:sequence>
+ <xs:element name="parsable_dv" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="formalism" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -103,13 +123,15 @@
<xs:complexType name="DvMedia">
<xs:complexContent>
<xs:extension base="mlhim2:DvEncapsulated">
- <xs:attribute name="mime_type" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="compression_type" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="hash_result" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="hash_function" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="alt_txt" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="uri" type="xs:anyURI" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="media_content" type="xs:base64Binary" maxOccurs="1" minOccurs="0"/>
+ <xs:sequence>
+ <xs:element name="mime_type" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="compression_type" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="hash_result" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="hash_function" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="alt_txt" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="uri" type="xs:anyURI" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="media_content" type="xs:base64Binary" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -117,9 +139,11 @@
<xs:complexType abstract="true" name="DvOrdered">
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
- <xs:attribute name="normal_range" type="mlhim2:ReferenceRange" minOccurs="0" maxOccurs="unbounded"/>
- <xs:attribute name="other_reference_ranges" type="mlhim2:ReferenceRange" minOccurs="0" maxOccurs="unbounded"/>
- <xs:attribute name="normal_status" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:sequence>
+ <xs:element name="normal_range" type="mlhim2:ReferenceRange" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="other_reference_ranges" type="mlhim2:ReferenceRange" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="normal_status" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -127,8 +151,10 @@
<xs:complexType name="DvOrdinal">
<xs:complexContent>
<xs:extension base="mlhim2:DvOrdered">
- <xs:attribute name="ordinal_dv" type="xs:int" use="required"/>
- <xs:attribute name="symbol" type="xs:string" use="required" whitespace="preserve"/>
+ <xs:sequence>
+ <xs:element name="ordinal_dv" type="xs:int" use="required"/>
+ <xs:element name="symbol" type="xs:string" use="required" whitespace="preserve"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -136,12 +162,14 @@
<xs:complexType abstract="true" name="DvQuantified">
<xs:complexContent>
<xs:extension base="mlhim2:DvOrdered">
- <xs:attribute name="magnitude" type="xs:decimal" use="required"/>
- <xs:attribute name="min_magnitude" type="xs:decimal" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="max_magnitude" type="xs:decimal" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="magnitude_status" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="error" type="xs:int" use="required" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="accuracy" type="xs:decimal" default="0"/>
+ <xs:sequence>
+ <xs:element name="magnitude" type="xs:decimal" use="required"/>
+ <xs:element name="min_magnitude" type="xs:decimal" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="max_magnitude" type="xs:decimal" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="magnitude_status" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="error" type="xs:int" use="required" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="accuracy" type="xs:decimal" default="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -149,7 +177,9 @@
<xs:complexType name="DvCount">
<xs:complexContent>
<xs:extension base="mlhim2:DvQuantified">
- <xs:attribute name="units" type="xs:string" use="required" whitespace="preserve"/>
+ <xs:sequence>
+ <xs:element name="units" type="xs:string" use="required" whitespace="preserve"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -157,7 +187,9 @@
<xs:complexType name="DvQuantity">
<xs:complexContent>
<xs:extension base="mlhim2:DvQuantified">
- <xs:attribute name="units" type="mlhim2:DvCodedString" use="required"/>
+ <xs:sequence>
+ <xs:element name="units" type="mlhim2:DvCodedString" use="required"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -165,10 +197,12 @@
<xs:complexType name="DvRatio">
<xs:complexContent>
<xs:extension base="mlhim2:DvQuantified">
- <xs:attribute name="numerator" type="xs:decimal"/>
- <xs:attribute name="denominator" type="xs:decimal"/>
- <xs:attribute name="numerator_units" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
- <xs:attribute name="denominator_units" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:sequence>
+ <xs:element name="numerator" type="xs:decimal"/>
+ <xs:element name="denominator" type="xs:decimal"/>
+ <xs:element name="numerator_units" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:element name="denominator_units" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -176,7 +210,9 @@
<xs:complexType name="DvRate">
<xs:complexContent>
<xs:extension base="mlhim2:DvRatio">
- <xs:attribute name="rate_type" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:sequence>
+ <xs:element name="rate_type" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -184,7 +220,9 @@
<xs:complexType name="DvProportion">
<xs:complexContent>
<xs:extension base="mlhim2:DvRatio">
- <xs:attribute name="proportion_type" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ <xs:sequence>
+ <xs:element name="proportion_type" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -192,12 +230,14 @@
<xs:complexType name="DvInterval">
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
- <xs:attribute name="lower" type="mlhim2:DvOrdered"/>
- <xs:attribute name="upper" type="mlhim2:DvOrdered"/>
- <xs:attribute name="lower_included" type="xs:boolean"/>
- <xs:attribute name="upper_included" type="xs:boolean"/>
- <xs:attribute name="lower_unbounded" type="xs:boolean"/>
- <xs:attribute name="upper_unbounded" type="xs:boolean"/>
+ <xs:sequence>
+ <xs:element name="lower" type="mlhim2:DvOrdered"/>
+ <xs:element name="upper" type="mlhim2:DvOrdered"/>
+ <xs:element name="lower_included" type="xs:boolean"/>
+ <xs:element name="upper_included" type="xs:boolean"/>
+ <xs:element name="lower_unbounded" type="xs:boolean"/>
+ <xs:element name="upper_unbounded" type="xs:boolean"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -205,8 +245,10 @@
<xs:complexType name="ReferenceRange">
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
- <xs:attribute name="definition" type="xs:string"/>
- <xs:attribute name="data_range" type="mlhim2:DvInterval" use="required"/>
+ <xs:sequence>
+ <xs:element name="definition" type="xs:string"/>
+ <xs:element name="data_range" type="mlhim2:DvInterval" use="required"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -214,8 +256,10 @@
<xs:complexType abstract="true" name="DvTemporal">
<xs:complexContent>
<xs:extension base="mlhim2:DvOrdered">
- <xs:attribute name="temporal_dv" type="xs:string"/>
- <xs:attribute name="allow_partial" type="xs:boolean" use="required" default="false"/>
+ <xs:sequence>
+ <xs:element name="temporal_dv" type="xs:string"/>
+ <xs:element name="allow_partial" type="xs:boolean" use="required" default="false"/>
+ </xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -223,7 +267,9 @@
<xs:complexType name="DvDuration">
<xs:complexContent>
<xs:restriction base="mlhim2:DvTemporal">
- <xs:attribute name="temporal_dv" type="xs:duration"/>
+ <xs:sequence>
+ <xs:element name="temporal_dv" type="xs:duration"/>
+ </xs:sequence>
</xs:restriction>
</xs:complexContent>
</xs:complexType>
@@ -231,7 +277,9 @@
<xs:complexType name="DvDateTime">
<xs:complexContent>
<xs:restriction base="mlhim2:DvTemporal">
- <xs:attribute name="temporal_dv" type="xs:datetime"/>
+ <xs:sequence>
+ <xs:element name="temporal_dv" type="xs:datetime"/>
+ </xs:sequence>
</xs:restriction>
</xs:complexContent>
</xs:complexType>
@@ -239,7 +287,9 @@
<xs:complexType name="DvDate">
<xs:complexContent>
<xs:restriction base="mlhim2:DvTemporal">
- <xs:attribute name="temporal_dv" type="xs:date"/>
+ <xs:sequence>
+ <xs:element name="temporal_dv" type="xs:date"/>
+ </xs:sequence>
</xs:restriction>
</xs:complexContent>
</xs:complexType>
@@ -247,7 +297,9 @@
<xs:complexType name="DvTime">
<xs:complexContent>
<xs:restriction base="mlhim2:DvTemporal">
- <xs:attribute name="temporal_dv" type="xs:time"/>
+ <xs:sequence>
+ <xs:element name="temporal_dv" type="xs:time"/>
+ </xs:sequence>
</xs:restriction>
</xs:complexContent>
</xs:complexType>
=== removed file 'schemas/ecore-schemas.zip'
Binary files schemas/ecore-schemas.zip 2012-05-25 23:12:21 +0000 and schemas/ecore-schemas.zip 1970-01-01 00:00:00 +0000 differ
