mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00547
[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 274: Renamed some elements toavoidtype conflicts.
------------------------------------------------------------
revno: 274
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Sun 2012-06-17 17:22:58 -0300
message:
Renamed some elements toavoidtype conflicts.
modified:
schemas/ccd.xsd
schemas/common.xsd
schemas/datatypes.xsd
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/ccd.xsd'
--- schemas/ccd.xsd 2012-06-15 19:13:14 +0000
+++ schemas/ccd.xsd 2012-06-17 20:22:58 +0000
@@ -1,6 +1,9 @@
<?xml version="1.1" 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: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="common.xsd"/>
=== modified file 'schemas/common.xsd'
--- schemas/common.xsd 2012-06-15 19:13:14 +0000
+++ schemas/common.xsd 2012-06-17 20:22:58 +0000
@@ -78,7 +78,7 @@
</xs:documentation>
</xs:annotation>
<xs:sequence>
- <xs:element name="feeder_audit" type="mlhim2:FeederAuditType"/>
+ <xs:element name="feeder_audit" minOccurs="0" type="mlhim2:FeederAuditType"/>
</xs:sequence>
</xs:complexType>
=== modified file 'schemas/datatypes.xsd'
--- schemas/datatypes.xsd 2012-06-15 19:13:14 +0000
+++ schemas/datatypes.xsd 2012-06-17 20:22:58 +0000
@@ -72,7 +72,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 minOccurs="0" name="dv" type="xs:string"/>
+ <xs:element minOccurs="0" name="DvBoolean_dv" type="xs:string"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -88,7 +88,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvAnyType">
<xs:sequence>
- <xs:element minOccurs="0" name="dv" type="xs:anyURI"/>
+ <xs:element minOccurs="0" name="DvURI_dv" type="xs:anyURI"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -103,7 +103,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvAnyType">
<xs:sequence>
- <xs:element minOccurs="0" name="dv" type="xs:string"/>
+ <xs:element minOccurs="0" name="DvString_dv" type="xs:string"/>
<xs:element maxOccurs="1" minOccurs="0" name="language" type="xs:language"/>
</xs:sequence>
</xs:extension>
@@ -180,7 +180,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvEncapsulatedType">
<xs:sequence>
- <xs:element minOccurs="0" name="dv" type="xs:string"/>
+ <xs:element minOccurs="0" name="DvParsable_dv" type="xs:string"/>
<xs:element maxOccurs="1" minOccurs="0" name="formalism" type="xs:string"/>
</xs:sequence>
</xs:extension>
@@ -221,10 +221,8 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvAnyType">
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="normal_range"
- type="mlhim2:ReferenceRangeType"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="other_reference_ranges"
- type="mlhim2:ReferenceRangeType"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="normal_range" type="mlhim2:ReferenceRangeType"/>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="other_reference_ranges" type="mlhim2:ReferenceRangeType"/>
<xs:element maxOccurs="1" minOccurs="0" name="normal_status" type="xs:string"/>
</xs:sequence>
</xs:extension>
@@ -253,7 +251,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvOrderedType">
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="1" name="ordinal_dv" type="xs:int"/>
+ <xs:element maxOccurs="1" minOccurs="1" name="DvOrdinal_dv" type="xs:int"/>
<xs:element maxOccurs="1" minOccurs="1" name="symbol" type="xs:string"/>
</xs:sequence>
</xs:extension>
@@ -296,7 +294,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvQuantifiedType">
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="1" name="units" type="xs:string"/>
+ <xs:element maxOccurs="1" minOccurs="1" name="DvCount_units" type="xs:string"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -317,7 +315,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvQuantifiedType">
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="1" name="units" type="mlhim2:DvCodedStringType"/>
+ <xs:element maxOccurs="1" minOccurs="1" name="DvQuantity_units" type="mlhim2:DvCodedStringType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -447,7 +445,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvAnyType">
<xs:sequence>
- <xs:element name="definition" type="xs:string"/>
+ <xs:element name="ReferenceRange_definition" type="xs:string"/>
<xs:element maxOccurs="1" minOccurs="1" name="data_range" type="mlhim2:DvIntervalType"/>
</xs:sequence>
</xs:extension>
@@ -488,7 +486,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvTemporalType">
<xs:sequence>
- <xs:element name="dv" type="xs:duration"/>
+ <xs:element name="DvDuration_dv" type="xs:duration"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -505,7 +503,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvTemporalType">
<xs:sequence>
- <xs:element name="dv" type="xs:dateTime"/>
+ <xs:element name="DvDateTime_dv" type="xs:dateTime"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -526,7 +524,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvTemporalType">
<xs:sequence>
- <xs:element name="dv" type="xs:date"/>
+ <xs:element name="DvDate_dv" type="xs:date"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -549,7 +547,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvTemporalType">
<xs:sequence>
- <xs:element name="dv" type="xs:time"/>
+ <xs:element name="DvTime_dv" type="xs:time"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -560,7 +558,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvTemporalType">
<xs:sequence>
- <xs:element name="dv" type="xs:gDay"/>
+ <xs:element name="DvDay_dv" type="xs:gDay"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -571,7 +569,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvTemporalType">
<xs:sequence>
- <xs:element name="dv" type="xs:gMonth"/>
+ <xs:element name="DvMonth_dv" type="xs:gMonth"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -581,7 +579,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvTemporalType">
<xs:sequence>
- <xs:element name="dv" type="xs:gYear"/>
+ <xs:element name="DvYear_dv" type="xs:gYear"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -592,7 +590,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvTemporalType">
<xs:sequence>
- <xs:element name="dv" type="xs:gYearMonth"/>
+ <xs:element name="DvYearMonth_dv" type="xs:gYearMonth"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -602,7 +600,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:DvTemporalType">
<xs:sequence>
- <xs:element name="dv" type="xs:gMonthDay"/>
+ <xs:element name="DvMonthDay_dv" type="xs:gMonthDay"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
=== modified file 'schemas/structures.xsd'
--- schemas/structures.xsd 2012-06-15 19:13:14 +0000
+++ schemas/structures.xsd 2012-06-17 20:22:58 +0000
@@ -62,7 +62,7 @@
<xs:complexContent>
<xs:extension base="mlhim2:ItemType">
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="1" name="dv" type="mlhim2:DvAnyType"/>
+ <xs:element maxOccurs="1" minOccurs="1" name="Element_dv" type="mlhim2:DvAnyType"/>
</xs:sequence>
</xs:extension>
</xs:complexContent>
