mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00094
[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 89: Completed datatypes.
------------------------------------------------------------
revno: 89
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Sat 2011-04-16 00:44:28 -0500
message:
Completed datatypes.
modified:
specs/2.0.x/mlhim/schemas/datatypes.xsd
specs/2.0.x/mlhim/schemas/support.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/datatypes.xsd'
--- specs/2.0.x/mlhim/schemas/datatypes.xsd 2011-04-16 04:45:30 +0000
+++ specs/2.0.x/mlhim/schemas/datatypes.xsd 2011-04-16 05:44:28 +0000
@@ -2,6 +2,7 @@
<!-- 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" 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>
@@ -9,6 +10,7 @@
<xs:element name="ev" maxOccurs="1" minOccurs="0" type="mlhim2:ExceptionalValue"></xs:element>
</xs:sequence>
</xs:complexType>
+
<xs:complexType name="DvText" base="mlhim2:DvAny" abstract="false">
<xs:sequence>
<xs:element name="uuid" maxOccurs="1" minOccurs="1" type="xs:string" nillable="false"></xs:element>
@@ -16,6 +18,7 @@
<xs:element name="dv" maxOccurs="1" minOccurs="0" type="xs:string" nillable="true"></xs:element>
</xs:sequence>
</xs:complexType>
+
<xs:complexType name="DvCodedText" base="mlhim2:DvText" abstract="false">
<xs:sequence>
<xs:element name="code_string" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
@@ -23,6 +26,7 @@
<xs:element name="terminology_abbrev" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+
<xs:complexType name="DvIdentifier" base="mlhim2:DvText" abstract="false">
<xs:sequence>
<xs:element name="issuer" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
@@ -30,21 +34,25 @@
<xs:element name="name" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+
<xs:complexType name="DvBoolean" base="mlhim2:DvAny" abstract="false">
<xs:sequence>
<xs:element name="dv" maxOccurs="1" minOccurs="0" type="xs:string" nillable="true"></xs:element>
</xs:sequence>
</xs:complexType>
+
<xs:complexType name="DvURI" base="mlhim2:DvAny" abstract="false">
<xs:sequence>
<xs:element name="dv" maxOccurs="1" minOccurs="0" type="xs:anyURI" nillable="true"></xs:element>
</xs:sequence>
</xs:complexType>
+
<xs:complexType name="DvParagraph" base="mlhim2:DvAny" abstract="false">
<xs:sequence>
<xs:element name="items" maxOccurs="Unbounded" minOccurs="0" type="mlhim2:DvText" nillable="false"></xs:element>
</xs:sequence>
</xs:complexType>
+
<xs:complexType name="DvEncapsulated" base="mlhim2:DvAny" abstract="true">
<xs:sequence>
<xs:element name="size" maxOccurs="1" minOccurs="1" type="xs:integer"></xs:element>
@@ -52,13 +60,15 @@
<xs:element name="language" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+
<xs:complexType name="DvParsable" base="mlhim2:DvEncapsulated" abstract="false">
<xs:sequence>
<xs:element name="dv" maxOccurs="1" minOccurs="0"ttype="xs:string" nillable="true"></xs:element>
<xs:element name="formalism" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="DvMultimedia" base="mlhim2:DvEncapsulated" abstract="false">
+
+ <xs:complexType name="DvMultimedia" base="mlhim2:DvEncapsulated" abstract="false">
<xs:sequence>
<xs:element name="dv" maxOccurs="1" minOccurs="0" type="xs:base64Binary" nillable="true"></xs:element>
<xs:element name="mime_type" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
@@ -81,19 +91,99 @@
<xs:element name="upper_unbounded" maxOccurs="1" minOccurs="1" type="xs:boolean"></xs:element>
</xs:sequence>
</xs:complexType>
+
<xs:complexType name="ReferenceRange" base="mlhim2:DvAny" abstract="false">
<xs:sequence>
<xs:element name="definition" maxOccurs="1" minOccurs="1" type="mlhim2:DvText"></xs:element>
<xs:element name="data_range" maxOccurs="1" minOccurs="1" type="mlhim2:DvInterval"></xs:element>
</xs:sequence>
</xs:complexType>
+
+ <xs:simpleType name="RefRanges">
+ <xs:list itemType="mlhim2:ReferenceRange"></xs:list>
+ </xs:simpleType>
+
<xs:complexType name="DvOrdered" base="mlhim2:DvAny" abstract="true">
<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="xs:list"></xs:element>
+ <xs:element name="other_reference_ranges" maxOccurs="unbounded" minOccurs="0" type="mlhim2:RefRanges"></xs:element>
<xs:element name="normal_status" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
-
+ <xs:complexType name="DvOrdinal" base="mlhim2:DvOrdered" abstract="false">
+ <xs:sequence>
+ <xs:element name="dv" maxOccurs="1" minOccurs="0" type="xs:integer"></xs:element>
+ <xs:element name="symbol" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="DvQuantified" base="mlhim2:DvOrdered" abstract="true">
+ <xs:sequence>
+ <xs:element name="magnitude" maxOccurs="1" minOccurs="0" type="xs:long"></xs:element>
+ <xs:element name="magnitude_status" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
+ <xs:element name="error" maxOccurs="1" minOccurs="1" type="xs:long"></xs:element>
+ <xs:element name="accuracy_unknown" maxOccurs="1" minOccurs="1" type="xs:boolean"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="DvDateTime" base="mlhim2:DvQuantified" abstract="false">
+ <xs:sequence>
+ <xs:element name="dv" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="DvQuantity" base="mlhim2:DvQuantified" abstract="false">
+ <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:complexType>
+
+ <xs:complexType name="DvCount" base="mlhim2:DvQuantified" abstract="false">
+ <xs:sequence>
+ <xs:element name="count" maxOccurs="1" minOccurs="0" type="xs:integer"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="DvDuration" base="mlhim2:DvQuantified" abstract="false">
+ <xs:sequence>
+ <xs:element name="dv" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="DvQuantity" base="mlhim2:DvQuantified" abstract="false">
+ <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:complexType>
+
+ <xs:complexType name="DvRatio" base="mlhim2:DvQuantified" abstract="true">
+ <xs:sequence>
+ <xs:element name="numerator" maxOccurs="1" minOccurs="0" type="xs:long"></xs:element>
+ <xs:element name="denominator" maxOccurs="1" minOccurs="0" type="xs:long"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="DvQuantity" base="mlhim2:DvQuantified" abstract="false">
+ <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:complexType>
+
+ <xs:complexType name="DvCoefficient" base="mlhim2:DvRatio" abstract="false">
+ <xs:sequence>
+ <xs:element name="coefficient_type" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="DvProportion" base="mlhim2:DvRatio" abstract="false">
+ <xs:sequence>
+ <xs:element name="proportion_type" maxOccurs="1" minOccurs="0" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+
</xs:schema>
=== modified file 'specs/2.0.x/mlhim/schemas/support.xsd'
--- specs/2.0.x/mlhim/schemas/support.xsd 2011-04-15 23:15:24 +0000
+++ specs/2.0.x/mlhim/schemas/support.xsd 2011-04-16 05:44:28 +0000
@@ -7,6 +7,7 @@
<xs:element maxOccurs="1" minOccurs="1" name="ev_meaning" type="xs:string"/>
</xs:sequence>
</xs:complexType>
+
<xs:complexType base="ExceptionalValue" name="NI"/>
<xs:complexType base="NI" name="MSK"/>
<xs:complexType base="NI" name="NA"/>
@@ -22,6 +23,7 @@
<xs:complexType base="OTH" name="NINF"/>
<xs:complexType base="OTH" name="PINF"/>
<xs:complexType base="ASKU" name="NAV"/>
+
<xs:complexType name="ObjectRef">
<xs:sequence>
<xs:element name="uuid" maxOccurs="1" minOccurs="1" type="xs:string"></xs:element>
@@ -29,5 +31,7 @@
<xs:element name="obj_type" maxOccurs="1" minOccurs="1" type="xs:string"></xs:element>
</xs:sequence>
</xs:complexType>
+
<xs:complexType base="ObjectRef" name="EntityRef"/>
+
</xs:schema>
