← Back to team overview

mlhim-specs-dev team mailing list archive

[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 257: Validated datatypes

 

------------------------------------------------------------
revno: 257
committer: Eduardo César <xcesar@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Tue 2012-05-29 09:54:51 -0300
message:
  Validated datatypes
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-28 18:24:16 +0000
+++ schemas/datatypes.xsd	2012-05-29 12:54:51 +0000
@@ -11,7 +11,7 @@
       <xs:complexContent>
          <xs:extension base="xs:anySimpleType">
          <xs:sequence>
-            <xs:element name="name" type="xs:string" whitespace="collapse"  maxOccurs="1" minOccurs="1"/>
+            <xs:element name="name" type="xs:string"  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"/>
@@ -36,7 +36,7 @@
     <xs:complexContent>
       <xs:extension base="mlhim2:DvAny">
       <xs:sequence>
-        <xs:element name="string_dv" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="string_dv" type="xs:string" maxOccurs="1" minOccurs="0"/>
         <xs:element name="language" type="xs:language" maxOccurs="1" minOccurs="0"/>
         </xs:sequence>
       </xs:extension>
@@ -77,9 +77,9 @@
     <xs:complexContent>
       <xs:extension base="mlhim2:DvString">
       <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:element name="terminology_abbrev" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="terminology_name" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="terminology_code" type="xs:string" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>  
       </xs:extension>
     </xs:complexContent>
@@ -89,9 +89,9 @@
     <xs:complexContent>
       <xs:extension base="mlhim2:DvString">
       <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:element name="id_name" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="issuer" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="assignor" type="xs:string" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>
       </xs:extension>
     </xs:complexContent>
@@ -102,8 +102,8 @@
       <xs:extension base="mlhim2:DvAny">
       <xs:sequence>
         <xs:element name="size" type="xs:int"  minOccurs="1" maxOccurs="1"/>
-        <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:element name="charset" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="language" type="xs:language" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>  
       </xs:extension>
     </xs:complexContent>
@@ -113,8 +113,8 @@
     <xs:complexContent>
       <xs:extension base="mlhim2:DvEncapsulated">
       <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:element name="parsable_dv" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="formalism" type="xs:string" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>  
       </xs:extension>
     </xs:complexContent>
@@ -124,11 +124,11 @@
     <xs:complexContent>
       <xs:extension base="mlhim2:DvEncapsulated">
       <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="mime_type" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="compression_type" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="hash_result" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="hash_function" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="alt_txt" type="xs:string" 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>  
@@ -142,7 +142,7 @@
       <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:element name="normal_status" type="xs:string" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>  
       </xs:extension>
     </xs:complexContent>
@@ -153,7 +153,7 @@
       <xs:extension base="mlhim2:DvOrdered">
       <xs:sequence>
         <xs:element name="ordinal_dv" type="xs:int"  minOccurs="1" maxOccurs="1"/>
-        <xs:element name="symbol" type="xs:string"  minOccurs="1" maxOccurs="1" whitespace="preserve"/>
+        <xs:element name="symbol" type="xs:string"  minOccurs="1" maxOccurs="1"/>
       </xs:sequence>  
       </xs:extension>
     </xs:complexContent>
@@ -166,7 +166,7 @@
         <xs:element name="magnitude" type="xs:decimal"  minOccurs="1" maxOccurs="1"/>
         <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="magnitude_status" type="xs:string" maxOccurs="1" minOccurs="0"/>
         <xs:element name="error" type="xs:int"  minOccurs="1" maxOccurs="1"/>
         <xs:element name="accuracy" type="xs:decimal" default="0"/>
       </xs:sequence>  
@@ -178,7 +178,7 @@
     <xs:complexContent>
       <xs:extension base="mlhim2:DvQuantified">
       <xs:sequence>
-        <xs:element name="units" type="xs:string"  minOccurs="1" maxOccurs="1" whitespace="preserve"/>
+        <xs:element name="units" type="xs:string"  minOccurs="1" maxOccurs="1"/>
       </xs:sequence>  
       </xs:extension>
     </xs:complexContent>
@@ -200,8 +200,8 @@
       <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:element name="numerator_units" type="xs:string" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="denominator_units" type="xs:string" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>  
       </xs:extension>
     </xs:complexContent>
@@ -211,7 +211,7 @@
     <xs:complexContent>
       <xs:extension base="mlhim2:DvRatio">
       <xs:sequence>
-        <xs:element name="rate_type" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="rate_type" type="xs:string" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>  
       </xs:extension>
     </xs:complexContent>
@@ -221,7 +221,7 @@
     <xs:complexContent>
       <xs:extension base="mlhim2:DvRatio">
       <xs:sequence>
-        <xs:element name="proportion_type" type="xs:string" whitespace="preserve" maxOccurs="1" minOccurs="0"/>
+        <xs:element name="proportion_type" type="xs:string" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>  
       </xs:extension>
     </xs:complexContent>


Follow ups