mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00537
[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 267: Changed DvAny.name to DvAny.data_name
------------------------------------------------------------
revno: 267
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Sat 2012-06-09 11:48:25 -0300
message:
Changed DvAny.name to DvAny.data_name
modified:
schemas/ccd.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-07 00:04:57 +0000
+++ schemas/ccd.xsd 2012-06-09 14:48:25 +0000
@@ -1,6 +1,8 @@
<?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/common.xsd"/>
+
<xs:complexType name="CCD">
<xs:annotation>
<xs:documentation>
@@ -14,5 +16,5 @@
<xs:element name="definition" type="mlhim2:Locatable"/>
</xs:sequence>
</xs:complexType>
-
+
</xs:schema>
\ No newline at end of file
=== modified file 'schemas/datatypes.xsd'
--- schemas/datatypes.xsd 2012-06-07 00:04:57 +0000
+++ schemas/datatypes.xsd 2012-06-09 14:48:25 +0000
@@ -11,13 +11,7 @@
</xs:documentation>
</xs:annotation>
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="0" name="name">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:whiteSpace value="collapse"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
+ <xs:element name="data_name" type="xs:string"/>
<xs:element maxOccurs="1" minOccurs="0" name="ev" nillable="true" type="mlhim2:ExceptionalValue"/>
<xs:element maxOccurs="1" minOccurs="0" name="valid_time_begin" nillable="true" type="xs:dateTime"/>
<xs:element maxOccurs="1" minOccurs="0" name="valid_time_end" nillable="true" type="xs:dateTime"/>
@@ -29,7 +23,7 @@
<xs:documentation>
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.
+ 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.
</xs:documentation>
@@ -73,8 +67,8 @@
<xs:element minOccurs="0" name="dv">
<xs:simpleType>
<xs:restriction base="xs:string">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element maxOccurs="1" minOccurs="0" name="language" type="xs:language"/>
@@ -121,8 +115,8 @@
<xs:element minOccurs="0" name="dv">
<xs:simpleType>
<xs:restriction base="xs:token">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
@@ -482,13 +476,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvOrdered">
<xs:sequence>
- <xs:element name="dv">
- <xs:simpleType>
- <xs:restriction base="xs:anySimpleType">
-
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
+ <xs:element name="dv" type="xs:string"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -518,8 +506,8 @@
<xs:element name="dv">
<xs:simpleType>
<xs:restriction base="xs:duration">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
@@ -541,8 +529,8 @@
<xs:element name="dv">
<xs:simpleType>
<xs:restriction base="xs:dateTime">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
@@ -568,8 +556,8 @@
<xs:element name="dv">
<xs:simpleType>
<xs:restriction base="xs:date">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
@@ -597,8 +585,8 @@
<xs:element name="dv">
<xs:simpleType>
<xs:restriction base="xs:time">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
@@ -614,8 +602,8 @@
<xs:element name="dv">
<xs:simpleType>
<xs:restriction base="xs:gDay">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
@@ -631,8 +619,8 @@
<xs:element name="dv">
<xs:simpleType>
<xs:restriction base="xs:gMonth">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
@@ -647,8 +635,8 @@
<xs:element name="dv">
<xs:simpleType>
<xs:restriction base="xs:gYear">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
@@ -664,8 +652,8 @@
<xs:element name="dv">
<xs:simpleType>
<xs:restriction base="xs:gYearMonth">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
@@ -680,8 +668,8 @@
<xs:element name="dv">
<xs:simpleType>
<xs:restriction base="xs:gMonthDay">
-
- </xs:restriction>
+
+ </xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
