mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 323
committer: timothywayne-cook <tim@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Sat 2013-02-09 19:19:00 -0200
message:
  Added documentation for DvTemporalType to describe how to restrict it in CCDs.
modified:
  schemas/2_4_1/mlhim2.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/2_4_1/mlhim2.xsd'
--- schemas/2_4_1/mlhim2.xsd	2013-02-09 20:50:00 +0000
+++ schemas/2_4_1/mlhim2.xsd	2013-02-09 21:19:00 +0000
@@ -630,27 +630,33 @@
         <xs:sequence>
           <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-dv">
             <xs:annotation>
-              <xs:documentation>Must be constrained in CCDs to be one of a set of DvTemporalType sub-types.  This gives the modeller the ability to optionally allow partial dates at run time.  </xs:documentation>
+              <xs:documentation>Must be constrained in CCDs to be one of the below elements.  
+                This gives the modeller the ability to optionally allow partial dates at run time.  
+                Setting maxOccurs and minOccurs to zero cause the element to be prohibitied.
+              </xs:documentation>
             </xs:annotation>
             <xs:complexType>
-              <xs:choice>
-                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-date" type="mlhim2:DvDateType"/>
-                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-time" type="mlhim2:DvTimeType"/>
-                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-datetime" type="mlhim2:DvDateTimeType"/>
-                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-day" type="mlhim2:DvDayType"/>
-                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-month" type="mlhim2:DvMonthType"/>
-                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-year" type="mlhim2:DvYearType"/>
-                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-year-month" type="mlhim2:DvYearMonthType"/>
-                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-month-day" type="mlhim2:DvMonthDayType"/>
-              </xs:choice>
+              <xs:choice maxOccurs="1" minOccurs="0">
+                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-date" type="xs:date"/>
+                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-time" type="xs:time"/>
+                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-datetime" type="xs:dateTime"/>
+                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-day" type="xs:gDay"/>
+                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-month" type="xs:gMonth"/>
+                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-year" type="xs:gYear"/>
+                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-year-month" type="xs:gYearMonth"/>
+                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-month-day" type="xs:gMonthDay"/>
+                <xs:element maxOccurs="1" minOccurs="0" name="DvTemporal-duration" type="xs:duration"/>              </xs:choice>
             </xs:complexType>                  
           </xs:element>
         </xs:sequence>
       </xs:extension> 
     </xs:complexContent>
   </xs:complexType>
-  <xs:element abstract="true" name="DvTemporal" substitutionGroup="mlhim2:DvAny" type="mlhim2:DvTemporalType"/>
-  
+  <xs:element name="DvTemporal" substitutionGroup="mlhim2:DvAny" type="mlhim2:DvTemporalType"/>
+
+  
+  
+  <!-- Commented out in 2.4.1   
   <xs:complexType name="DvDurationType">
     <xs:annotation>
       <xs:documentation>The duration data type is used to specify a time interval. The time interval is specified in the
@@ -816,7 +822,7 @@
     </xs:complexContent>
   </xs:complexType>
   <xs:element name="DvMonthDay" substitutionGroup="mlhim2:DvAny" type="mlhim2:DvMonthDayType"/>
-  
+-->  
   
   <!--Common package types-->