mlhim-specs-dev team mailing list archive

Thread
Date

[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 249: Cleaned up datatypes schema.

To: MLHIM Specifications Developers <mlhim-specs-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Sun, 27 May 2012 11:41:11 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 249
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Sat 2012-05-26 08:35:03 -0300
message:
  Cleaned up datatypes schema.
modified:
  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

=== modified file 'schemas/datatypes.xsd'
--- schemas/datatypes.xsd	2012-05-25 23:12:21 +0000
+++ schemas/datatypes.xsd	2012-05-26 11:35:03 +0000
@@ -1,218 +1,252 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
-       targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; elementFormDefault="qualified" version="2.3.0">
-           <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/common.xsd";></xs:include>
+<xs:schema xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; 
+                    xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
+                    targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; 
+                    elementFormDefault="qualified" version="2.3.0">
+           
+   <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/common.xsd";></xs:include>
 
   
-  <xs:complexType abstract="true" name="DvAny">
-    <xs:complexContent>
-      <xs:extension base="xs:anySimpleType">
-        <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:extension>
-    </xs:complexContent>
-  </xs:complexType>
+   <xs:complexType abstract="true" name="DvAny">
+      <xs:complexContent>
+         <xs:extension base="xs:anySimpleType">
+            <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:extension>
+       </xs:complexContent>
+    </xs:complexType>
   
-  <xs:complexType name="DvBoolean">
+    <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:extension>
+      </xs:complexContent>
+    </xs:complexType>
+    
+  <xs:complexType name="DvString">
     <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:attribute name="string_dv" type="xs:string"/>
+        <xs:attribute name="language" type="xs:language"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:complexType name="DvURI">
     <xs:complexContent>
-      <xs:extension base="mlhim2:DvString"/>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="DvString">
-    <xs:complexContent>
-      <xs:extension base="mlhim2:DvAny">
-        <xs:attribute ecore:name="string_dv" name="string_dv" type="xs:string"/>
-        <xs:attribute name="language" type="xs:language"/>
+      <xs:extension base="mlhim2:DvString">
+         <xs:attribute name="string_dv" type="xs:anyURI"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+
   <xs:complexType name="DvNormalizedString">
     <xs:complexContent>
-      <xs:extension base="mlhim2:DvString"/>
+      <xs:extension base="mlhim2:DvString">
+         <xs:attribute name="string_dv" type="xs:normalizedString"/>
+      </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvToken">
     <xs:complexContent>
-      <xs:extension base="mlhim2:DvString"/>
+      <xs:extension base="mlhim2:DvString">
+         <xs:attribute name="string_dv" type="xs:token"/>
+      </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvCodedString">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvString">
-        <xs:attribute ecore:name="terminology_abbrev" name="terminology_abbrev" type="xs:string"/>
-        <xs:attribute ecore:name="terminology_name" name="terminology_name" type="xs:string"/>
-        <xs:attribute ecore:name="terminology_code" name="terminology_code" type="xs:string"/>
+        <xs:attribute name="terminology_abbrev" type="xs:string"/>
+        <xs:attribute name="terminology_name" type="xs:string"/>
+        <xs:attribute name="terminology_code" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvIdentifier">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvString">
-        <xs:attribute ecore:name="id_name" name="id_name" type="xs:string"/>
+        <xs:attribute name="id_name" type="xs:string"/>
         <xs:attribute name="issuer" type="xs:string"/>
         <xs:attribute name="assignor" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType abstract="true" name="DvEncapsulated">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvAny">
-        <xs:attribute ecore:unsettable="false" name="size" type="xs:int" use="required"/>
+        <xs:attribute name="size" type="xs:int" use="required"/>
         <xs:attribute name="charset" type="xs:string"/>
         <xs:attribute name="language" type="xs:language"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvParsable">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvEncapsulated">
-        <xs:attribute ecore:name="parsable_dv" name="parsable_dv" type="xs:string"/>
+        <xs:attribute name="parsable_dv" type="xs:string"/>
         <xs:attribute name="formalism" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:complexType abstract="true" name="DvMedia">
+  
+  <xs:complexType name="DvMedia">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvEncapsulated">
-        <xs:attribute ecore:name="mime_type" name="mime_type" type="xs:string"/>
-        <xs:attribute ecore:name="compression_type" name="compression_type" type="xs:string"/>
-        <xs:attribute ecore:name="hash_result" name="hash_result" type="xs:string"/>
-        <xs:attribute ecore:name="hash_function" name="hash_function" type="xs:string"/>
-        <xs:attribute ecore:name="alt_txt" name="alt_txt" type="xs:string"/>
+        <xs:attribute name="mime_type" type="xs:string"/>
+        <xs:attribute name="compression_type" type="xs:string"/>
+        <xs:attribute name="hash_result" type="xs:string"/>
+        <xs:attribute name="hash_function" type="xs:string"/>
+        <xs:attribute name="alt_txt" type="xs:string"/>
         <xs:attribute name="uri" type="xs:string"/>
-        <xs:attribute ecore:name="media_content" name="media_content" type="xs:base64Binary"/>
+        <xs:attribute name="media_content" type="xs:base64Binary"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType abstract="true" name="DvOrdered">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvAny">
-        <xs:attribute ecore:name="normal_range" ecore:reference="mlhim2:ReferenceRange" name="normal_range" type="xs:anyURI"/>
-        <xs:attribute ecore:name="other_reference_ranges" ecore:reference="mlhim2:ReferenceRange" name="other_reference_ranges">
-          <xs:simpleType>
-            <xs:list itemType="xs:anyURI"/>
-          </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute ecore:name="normal_status" name="normal_status" type="xs:string"/>
+        <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"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvOrdinal">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvOrdered">
-        <xs:attribute ecore:name="ordinal_dv" ecore:unsettable="false" name="ordinal_dv" type="xs:int" use="required"/>
+        <xs:attribute name="ordinal_dv" type="xs:int" use="required"/>
         <xs:attribute name="symbol" type="xs:string" use="required"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType abstract="true" name="DvQuantified">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvOrdered">
         <xs:attribute name="magnitude" type="xs:decimal" use="required"/>
-        <xs:attribute ecore:name="min_magnitude" name="min_magnitude" type="xs:decimal"/>
-        <xs:attribute ecore:name="max_magnitude" name="max_magnitude" type="xs:decimal"/>
-        <xs:attribute ecore:name="magnitude_status" name="magnitude_status" type="xs:string"/>
-        <xs:attribute ecore:unsettable="false" name="error" type="xs:int" use="required"/>
-        <xs:attribute default="0" ecore:unsettable="false" name="accuracy" type="xs:decimal"/>
+        <xs:attribute name="min_magnitude" type="xs:decimal"/>
+        <xs:attribute name="max_magnitude" type="xs:decimal"/>
+        <xs:attribute name="magnitude_status" type="xs:string"/>
+        <xs:attribute name="error" type="xs:int" use="required"/>
+        <xs:attribute name="accuracy" type="xs:decimal" default="0"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvCount">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvQuantified">
-        <xs:attribute name="units" type="xs:string"/>
+        <xs:attribute name="units" type="xs:string" use="required"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvQuantity">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvQuantified">
-        <xs:attribute ecore:reference="mlhim2:DvCodedString" name="units" type="xs:anyURI" use="required"/>
+        <xs:attribute name="units" type="mlhim2:DvCodedString" use="required"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <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 ecore:name="numerator_units" name="numerator_units" type="xs:string"/>
-        <xs:attribute ecore:name="denominator_units" name="denominator_units" type="xs:string"/>
+        <xs:attribute name="numerator_units" type="xs:string"/>
+        <xs:attribute name="denominator_units" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvRate">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvRatio">
-        <xs:attribute ecore:name="rate_type" name="rate_type" type="xs:string"/>
+        <xs:attribute name="rate_type" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvProportion">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvRatio">
-        <xs:attribute ecore:name="proportion_type" name="proportion_type" type="xs:string"/>
+        <xs:attribute name="proportion_type" type="xs:string"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvInterval">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvAny">
-        <xs:attribute ecore:reference="mlhim2:DvOrdered" name="lower" type="xs:anyURI"/>
-        <xs:attribute ecore:reference="mlhim2:DvOrdered" name="upper" type="xs:anyURI"/>
-        <xs:attribute ecore:name="lower_included" ecore:unsettable="false" name="lower_included" type="xs:boolean"/>
-        <xs:attribute ecore:name="upper_included" ecore:unsettable="false" name="upper_included" type="xs:boolean"/>
-        <xs:attribute ecore:name="lower_unbounded" ecore:unsettable="false" name="lower_unbounded" type="xs:boolean"/>
-        <xs:attribute ecore:name="upper_unbounded" ecore:unsettable="false" name="upper_unbounded" type="xs:boolean"/>
+        <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:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="ReferenceRange">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvAny">
         <xs:attribute name="definition" type="xs:string"/>
-        <xs:attribute ecore:name="data_range" ecore:reference="mlhim2:DvInterval" name="data_range" type="xs:anyURI"/>
+        <xs:attribute name="data_range" type="mlhim2:DvInterval"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType abstract="true" name="DvTemporal">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvOrdered">
-        <xs:attribute ecore:name="temporal_dv" name="temporal_dv" type="xs:string"/>
-        <xs:attribute ecore:default="false" ecore:name="allow_partial" ecore:unsettable="false" name="allow_partial" type="xs:boolean" use="required"/>
+        <xs:attribute name="temporal_dv" type="xs:string"/>
+        <xs:attribute name="allow_partial" type="xs:boolean" use="required" default="false"/>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvDuration">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvTemporal"/>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvDateTime">
     <xs:complexContent>
-      <xs:extension base="mlhim2:DvTemporal"/>
+      <xs:restriction base="mlhim2:DvTemporal">
+      <xs:attribute name="temporal_dv" type="xs:DateTime"/>
+      </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvDate">
     <xs:complexContent>
-      <xs:extension base="mlhim2:DvTemporal"/>
+      <xs:restriction base="mlhim2:DvTemporal">
+      <xs:attribute name="temporal_dv" type="xs:Date"/>
+      </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
+  
   <xs:complexType name="DvTime">
     <xs:complexContent>
-      <xs:extension base="mlhim2:DvTemporal"/>
+      <xs:restriction base="mlhim2:DvTemporal">
+      <xs:attribute name="temporal_dv" type="xs:Time"/>
+      </xs:restriction>
     </xs:complexContent>
   </xs:complexType>
+  
 </xs:schema>