mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 152
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Sat 2011-05-14 23:20:02 -0500
message:
  Completed 2.2.0 structures.xsd updates.
modified:
  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/structures.xsd'
--- schemas/structures.xsd	2011-05-10 18:12:07 +0000
+++ schemas/structures.xsd	2011-05-15 04:20:02 +0000
@@ -37,7 +37,7 @@
            <xs:extension  base="mlhim2:Locatable">
              <xs:sequence>
               
-               <xs:element name="time" maxOccurs="1" minOccurs="1" type="mlhim2:DvDateTime">
+               <xs:element name="time" maxOccurs="1" minOccurs="1" type="mlhim2:DvTemporal">
 	    <xs:annotation><xs:documentation>Time of this event. If the width is non-zero, it is the time point of the trailing edge of the event.</xs:documentation></xs:annotation>
                </xs:element>
               
@@ -75,15 +75,15 @@
            <xs:extension base="mlhim2:Event">
              <xs:sequence>
               
-               <xs:element name="width" maxOccurs="1" minOccurs="1" type="mlhim2:DvInterval">
+               <xs:element name="width" maxOccurs="1" minOccurs="1" type="mlhim2:DvDuration">
 	    <xs:annotation><xs:documentation>Length of the interval during which the state was true.</xs:documentation></xs:annotation>
                </xs:element>
               
-               <xs:element name="math_function" maxOccurs="1" minOccurs="1" type="mlhim2:DvCodedText">
-	    <xs:annotation><xs:documentation>Mathematical function of the data of this event, e.g. “maximum”, “mean” etc. Coded  using MLHIM Terminology group “event  math function”.</xs:documentation></xs:annotation>
+               <xs:element name="math_function" maxOccurs="1" minOccurs="1" type="mlhim2:DvCodedString">
+	    <xs:annotation><xs:documentation>Mathematical function of the data of this event, e.g. “maximum”, “mean” etc. </xs:documentation></xs:annotation>
                </xs:element>
               
-               <xs:element name="sample_count" maxOccurs="1" minOccurs="1" type="xs:integer">
+               <xs:element name="sample_count" maxOccurs="1" minOccurs="0" type="mlhim2:DvCount">
 	    <xs:annotation><xs:documentation>Optional count of original samples to which this event corresponds.</xs:documentation></xs:annotation>
                </xs:element>
              </xs:sequence>          
@@ -114,11 +114,11 @@
            <xs:extension base="mlhim2:Item">
              <xs:sequence>
               
-               <xs:element name="ccd" maxOccurs="1" minOccurs="1" type="xs:string">
-	    <xs:annotation><xs:documentation>The CCD ID selelcted at run-time.</xs:documentation></xs:annotation>
+               <xs:element name="ccd" maxOccurs="1" minOccurs="1" type="mlhim2:DvToken">
+	    <xs:annotation><xs:documentation>The CCD ID selelcted at runtime.</xs:documentation></xs:annotation>
                </xs:element>
               
-               <xs:element name="allowed_ccds" maxOccurs="unbounded" minOccurs="1" type="xs:string">
+               <xs:element name="allowed_ccds" maxOccurs="unbounded" minOccurs="1" type="mlhim2:DvToken">
 	    <xs:annotation><xs:documentation>A list of allowed CCD IDs of which one is selelcted at runtime.</xs:documentation></xs:annotation>
                </xs:element>
              </xs:sequence>          
@@ -174,7 +174,7 @@
            <xs:extension base="mlhim2:DataStructure">
              <xs:sequence>
               
-               <xs:element name="origin" maxOccurs="1" minOccurs="1" type="mlhim2:DvDateTime">
+               <xs:element name="origin" maxOccurs="1" minOccurs="1" type="mlhim2:DvTemporal">
 	    <xs:annotation><xs:documentation>Time origin of this event history. The first event is not necessarily at the origin point.</xs:documentation></xs:annotation>
                </xs:element>
               
@@ -209,7 +209,7 @@
            <xs:extension base="mlhim2:ItemStructure">
              <xs:sequence>
               
-               <xs:element name="item" maxOccurs="1" minOccurs="0" type="mlhim2:Element">
+               <xs:element name="item" maxOccurs="1" minOccurs="1" type="mlhim2:Element">
 	    <xs:annotation><xs:documentation>Element, Cluster or Slot for this Item.</xs:documentation></xs:annotation>
                </xs:element>
              </xs:sequence>          
@@ -228,7 +228,7 @@
            <xs:extension base="mlhim2:ItemStructure">
              <xs:sequence>
               
-               <xs:element name="items" maxOccurs="unbounded" minOccurs="0" type="mlhim2:Element">
+               <xs:element name="items" maxOccurs="unbounded" minOccurs="1" type="mlhim2:Element">
 	    <xs:annotation><xs:documentation>List of Elements, Clusters or Slots for this Item.</xs:documentation></xs:annotation>
                </xs:element>
              </xs:sequence>          
@@ -250,7 +250,7 @@
            <xs:extension base="mlhim2:ItemStructure">
              <xs:sequence>
               
-               <xs:element name="rows" maxOccurs="unbounded" minOccurs="0" type="mlhim2:Cluster">
+               <xs:element name="rows" maxOccurs="unbounded" minOccurs="1" type="mlhim2:Cluster">
 	    <xs:annotation><xs:documentation>List of Clusters for this Item.</xs:documentation></xs:annotation>
                </xs:element>
              </xs:sequence>          
@@ -270,7 +270,7 @@
            <xs:extension  base="mlhim2:ItemStructure">
              <xs:sequence>
               
-               <xs:element name="items" maxOccurs="unbounded" minOccurs="0" type="mlhim2:ItemStructure">
+               <xs:element name="items" maxOccurs="unbounded" minOccurs="1" type="mlhim2:Item">
 	    <xs:annotation><xs:documentation>List of structures to define the root of the tree.</xs:documentation></xs:annotation>
                </xs:element>
              </xs:sequence>