mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00536
[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 266: Made the 'dv' attribute/element consistent and added the patial variants for datetime types.
------------------------------------------------------------
revno: 266
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Wed 2012-06-06 21:04:57 -0300
message:
Made the 'dv' attribute/element consistent and added the patial variants for datetime types.
added:
schemas/mlhim2.xsd
modified:
schemas/ccd.xsd
schemas/common.xsd
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/ccd.xsd'
--- schemas/ccd.xsd 2012-06-03 16:27:41 +0000
+++ schemas/ccd.xsd 2012-06-07 00:04:57 +0000
@@ -1,21 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; version="2.3.0">
- <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/datatypes.xsd"/>
- <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/common.xsd"/>
- <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/structures.xsd"/>
- <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/content.xsd"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; version="2.3.0">
- <xs:element name="ccd" type="mlhim2:CCD">
+ <xs:complexType name="CCD">
<xs:annotation>
<xs:documentation>
- This is the root node of a Concept Constraint Definition. You may name the file anything you wish as long as you maintain the Xmind ( .xmind ) extension.
+ This is the root node of a Concept Constraint Definition. You may name the file anything you wish as long as you maintain the Xmind ( .xmind ) extension.
- After saving the file; create your concept definition by copying the appropriate components from the sheets.
+ After saving the file; create your concept definition by copying the appropriate components from the sheets.
</xs:documentation>
</xs:annotation>
- </xs:element>
-
- <xs:complexType name="CCD">
<xs:sequence>
<xs:element name="definition" type="mlhim2:Locatable"/>
</xs:sequence>
=== modified file 'schemas/common.xsd'
--- schemas/common.xsd 2012-06-04 20:01:50 +0000
+++ schemas/common.xsd 2012-06-07 00:04:57 +0000
@@ -158,7 +158,7 @@
<xs:complexType name="NI">
<xs:complexContent>
- <xs:restriction base="ExceptionalValue">
+ <xs:restriction base="mlhim2:ExceptionalValue">
<xs:sequence>
<xs:element fixed="No Information" name="ev_name" type="xs:string"/>
<xs:element fixed="The value is exceptional (missing, omitted, incomplete, improper). No information as to the reason for being an exceptional value is provided. This is the most general exceptional value. It is also the default exceptional value " name="ev_meaning" type="xs:string"/>
=== modified file 'schemas/datatypes.xsd'
--- schemas/datatypes.xsd 2012-06-03 16:27:41 +0000
+++ schemas/datatypes.xsd 2012-06-07 00:04:57 +0000
@@ -27,11 +27,11 @@
<xs:complexType name="DvBoolean">
<xs:annotation>
<xs:documentation>
- Items which are truly boolean data, such as true/false or yes/no answers.
+ Items which represent boolean decisions, such as true/false or yes/no answers.
Use for such data, it is important to devise the meanings (usually questions in subjective data) carefully, so that the only allowed results are in fact true or false.
Potential MisUse: The DvBoolean class should not be used as a replacement for naively modelled enumerated types such as male/female etc. Such values should be coded, and in any case the enumeration often has more than two values.
- Though the DvBoolean.dv attribute is a String type this is to easily allow responses that the user is more familiar with using in the context such as 'Yes', 'No' or 'True', 'False'. A conversion method is required to convert the valid_trues to True and the valid_falses to False.
+ Though the DvBoolean.dv attribute is a String type this is to easily allow responses that the user is more familiar with using in the context such as 'Yes', 'No' or 'True', 'False'. A conversion method is required to convert the valid_trues to True and the valid_falses to False.
</xs:documentation>
</xs:annotation>
<xs:complexContent>
@@ -39,7 +39,7 @@
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="valid_trues" type="xs:string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="valid_falses" type="xs:string"/>
- <xs:element maxOccurs="1" minOccurs="0" name="bool_dv" type="xs:string"/>
+ <xs:element minOccurs="0" name="dv" type="xs:string"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -55,7 +55,7 @@
<xs:complexContent>
<xs:restriction base="mlhim2:DvAny">
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="0" name="string_dv" type="xs:anyURI"/>
+ <xs:element minOccurs="0" name="dv" type="xs:anyURI"/>
</xs:sequence>
</xs:restriction>
</xs:complexContent>
@@ -70,7 +70,13 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvAny">
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="0" name="string_dv" type="xs:string"/>
+ <xs:element minOccurs="0" name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
<xs:element maxOccurs="1" minOccurs="0" name="language" type="xs:language"/>
</xs:sequence>
</xs:extension>
@@ -90,7 +96,7 @@
<xs:complexContent>
<xs:restriction base="mlhim2:DvString">
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="0" name="string_dv">
+ <xs:element minOccurs="0" name="dv">
<xs:simpleType>
<xs:restriction base="xs:normalizedString"/>
</xs:simpleType>
@@ -105,14 +111,20 @@
<xs:documentation>
Derived from the String data type.
- The token data type also contains characters, but the line feeds, carriage returns, tabs, leading and trailing spaces are removed, and multiple spaces are replaced with one space.
+ The token data type also contains characters, but the line feeds, carriage returns, tabs, leading and trailing spaces are removed, and multiple spaces are replaced with one space.
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:restriction base="mlhim2:DvString">
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="0" name="string_dv" type="xs:token"/>
+ <xs:element minOccurs="0" name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
</xs:sequence>
</xs:restriction>
</xs:complexContent>
@@ -121,8 +133,8 @@
<xs:complexType name="DvCodedString">
<xs:annotation>
<xs:documentation>
- A text item whose string_dv attribute must be the long name or description from a
- controlled terminology.
+ A text item whose string_dv attribute must be the long name or description from a
+ controlled terminology.
The key (i.e. the 'code') of which is the code_string attribute.
@@ -188,7 +200,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvEncapsulated">
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="0" name="parsable_dv" type="xs:string"/>
+ <xs:element minOccurs="0" name="dv" type="xs:string"/>
<xs:element maxOccurs="1" minOccurs="0" name="formalism" type="xs:string"/>
</xs:sequence>
</xs:extension>
@@ -222,7 +234,7 @@
<xs:documentation>
Abstract class defining the concept of ordered values, which includes ordinals as well as true quantities.
- The implementations require the functions ‘<’, '>' and is_strictly_comparable_to ('==').
+ The implementations require the functions ‘<’, '>' and is_strictly_comparable_to ('==').
</xs:documentation>
</xs:annotation>
@@ -421,7 +433,7 @@
Used to define intervals of dates, times, quantities Whose units match and datatypes are the same and are ordered.
- If the implementation technology has a concept of intervals AND the technology provides for multiple inheritance, then this class may inherit directly from it.
+ If the implementation technology has a concept of intervals AND the technology provides for multiple inheritance, then this class may inherit directly from it.
</xs:documentation>
</xs:annotation>
@@ -470,8 +482,13 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvOrdered">
<xs:sequence>
- <xs:element name="temporal_dv" type="xs:string"/>
- <xs:element default="false" maxOccurs="1" minOccurs="1" name="allow_partial" type="xs:boolean"/>
+ <xs:element name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:anySimpleType">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -484,21 +501,27 @@
The time interval is specified in the following form "PnYnMnDTnHnMnS" where:
- P indicates the period (required)
- nY indicates the number of years
- nM indicates the number of months
- nD indicates the number of days
- T indicates the start of a time section (required if you are going to specify hours, minutes, or seconds)
- nH indicates the number of hours
- nM indicates the number of minutes
- nS indicates the number of seconds
+ P indicates the period (required)
+ nY indicates the number of years
+ nM indicates the number of months
+ nD indicates the number of days
+ T indicates the start of a time section (required if you are going to specify hours, minutes, or seconds)
+ nH indicates the number of hours
+ nM indicates the number of minutes
+ nS indicates the number of seconds
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:restriction base="mlhim2:DvTemporal">
<xs:sequence>
- <xs:element name="temporal_dv" type="xs:duration"/>
+ <xs:element name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:duration">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
</xs:sequence>
</xs:restriction>
</xs:complexContent>
@@ -509,13 +532,19 @@
<xs:documentation>
All dates and times representations in MLHIM use this class. Represents an absolute point in time.
Used for recording a precise point in real world time, and for approximate time stamps which may only be partially known.
- All dates and times are assumed to be in the "current era"; somewhere between 0001-01-01T00:00:00Z and 9999-12-31T23:59:59Z AD.
+ All dates and times are assumed to be in the "current era"; somewhere between 0001-01-01T00:00:00Z and 9999-12-31T23:59:59Z AD.
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:restriction base="mlhim2:DvTemporal">
<xs:sequence>
- <xs:element name="temporal_dv" type="xs:dateTime"/>
+ <xs:element name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:dateTime">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
</xs:sequence>
</xs:restriction>
</xs:complexContent>
@@ -528,15 +557,21 @@
The date is specified in the following form "YYYY-MM-DD" where:
- YYYY indicates the year
- MM indicates the month
- DD indicates the day
+ YYYY indicates the year
+ MM indicates the month
+ DD indicates the day
</xs:documentation>
</xs:annotation>
<xs:complexContent>
<xs:restriction base="mlhim2:DvTemporal">
<xs:sequence>
- <xs:element name="temporal_dv" type="xs:date"/>
+ <xs:element name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:date">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
</xs:sequence>
</xs:restriction>
</xs:complexContent>
@@ -549,9 +584,9 @@
The time is specified in the following form "hh:mm:ss" where:
- hh indicates the hour
- mm indicates the minute
- ss indicates the second
+ hh indicates the hour
+ mm indicates the minute
+ ss indicates the second
Note: All components are required!
</xs:documentation>
@@ -559,7 +594,96 @@
<xs:complexContent>
<xs:restriction base="mlhim2:DvTemporal">
<xs:sequence>
- <xs:element name="temporal_dv" type="xs:time"/>
+ <xs:element name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:time">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+
+ <xs:complexType name="DvDay">
+ <xs:complexContent>
+ <xs:restriction base="mlhim2:DvTemporal">
+ <xs:sequence>
+ <xs:element name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:gDay">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+
+ <xs:complexType name="DvMonth">
+ <xs:complexContent>
+ <xs:restriction base="mlhim2:DvTemporal">
+ <xs:sequence>
+ <xs:element name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:gMonth">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="DvYear">
+ <xs:complexContent>
+ <xs:restriction base="mlhim2:DvTemporal">
+ <xs:sequence>
+ <xs:element name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:gYear">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+
+ <xs:complexType name="DvYearMonth">
+ <xs:complexContent>
+ <xs:restriction base="mlhim2:DvTemporal">
+ <xs:sequence>
+ <xs:element name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:gYearMonth">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="DvMonthDay">
+ <xs:complexContent>
+ <xs:restriction base="mlhim2:DvTemporal">
+ <xs:sequence>
+ <xs:element name="dv">
+ <xs:simpleType>
+ <xs:restriction base="xs:gMonthDay">
+
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
</xs:sequence>
</xs:restriction>
</xs:complexContent>
=== added file 'schemas/mlhim2.xsd'
--- schemas/mlhim2.xsd 1970-01-01 00:00:00 +0000
+++ schemas/mlhim2.xsd 2012-06-07 00:04:57 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; version="2.3.0">
+
+
+ <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/datatypes.xsd"/>
+ <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/common.xsd"/>
+ <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/structures.xsd"/>
+ <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/content.xsd"/>
+ <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/ccd.xsd"/>
+
+
+</xs:schema>
\ No newline at end of file
