mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00803
[Branch ~cdd-dev/cdd/trunk] Rev 314: Updated the instance generator to 2.4.1
------------------------------------------------------------
revno: 314
committer: timothywayne-cook <tim@xxxxxxxxx>
branch nick: cdd
timestamp: Sat 2013-02-16 21:57:14 -0200
message:
Updated the instance generator to 2.4.1
modified:
src/instance-gen/ccd-949a53a0-0bc3-43ce-b900-1ff0b9c6798c.xsd
src/instance-gen/ccd-ca92a9c1-275f-42ca-b1a0-ac0a20cb2ec9.xsd
src/instance-gen/ccd-fa706c7a-f08a-4c80-8ce3-8ab7e2699517.xsd
src/xls2ccd/examples/cluster-example/ccd-f9493153-8960-4974-8725-3bf824319ac8.xsd
--
lp:cdd
https://code.launchpad.net/~cdd-dev/cdd/trunk
Your team MLHIM Specifications Developers is subscribed to branch lp:cdd.
To unsubscribe from this branch go to https://code.launchpad.net/~cdd-dev/cdd/trunk/+edit-subscription
=== modified file 'src/instance-gen/ccd-949a53a0-0bc3-43ce-b900-1ff0b9c6798c.xsd'
--- src/instance-gen/ccd-949a53a0-0bc3-43ce-b900-1ff0b9c6798c.xsd 2012-12-20 12:34:40 +0000
+++ src/instance-gen/ccd-949a53a0-0bc3-43ce-b900-1ff0b9c6798c.xsd 2013-02-16 23:57:14 +0000
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:mlhim2="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
- elementFormDefault="qualified"
- targetNamespace="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
- xmlns:data-view="http://www.w3.org/2003/g/data-view#";
- data-view:transformation="http://www.mlhim.org/ccd/ccd_md_view.xsl";>
-
+ xmlns:mlhim2="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:dc= "http://purl.org/dc/elements/1.1/";
+ elementFormDefault="qualified"
+ targetNamespace="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
+ xmlns:data-view="http://www.w3.org/2003/g/data-view#";
+ data-view:transformation="http://www.mlhim.org/ccd/ccd_md_view.xsl";>
+
<xs:annotation>
<xs:appinfo>
@@ -92,7 +94,6 @@
<xs:sequence>
<xs:element maxOccurs='unbounded' minOccurs='0' ref='mlhim2:links'/>
<xs:element maxOccurs='1' minOccurs='0' ref='mlhim2:feeder-audit'/>
- <xs:element maxOccurs='1' minOccurs='0' name='annotation' type='xs:string'/>
<xs:element maxOccurs='1' minOccurs='1' name='cluster-subject' type='xs:string' fixed='Care Cluster'/>
<xs:element maxOccurs='1' minOccurs='1' ref='mlhim2:el-a2bc25db-3111-4cd5-9825-d9c448cdd1a4'/>
</xs:sequence>
@@ -930,7 +931,19 @@
</xs:element>
<xs:element maxOccurs='1' minOccurs='0' name='min-magnitude' type='xs:decimal' fixed="5"/>
<xs:element maxOccurs='1' minOccurs='0' name='max-magnitude' type='xs:decimal' fixed="180"/>
- <xs:element maxOccurs='1' minOccurs='0' name='magnitude-status' type='xs:string'/>
+ <xs:element maxOccurs='1' minOccurs='0' name='magnitude-status'>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="="/>
+ <xs:enumeration value="<"/>
+ <xs:enumeration value=">"/>
+ <xs:enumeration value="<="/>
+ <xs:enumeration value=">="/>
+ <xs:enumeration value="~"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ </xs:element>
<xs:element maxOccurs='1' minOccurs='1' name='error' type='xs:int' default='0'/>
<xs:element maxOccurs='1' minOccurs='1' name='accuracy' type='xs:int' default='0'/>
<xs:element maxOccurs='1' minOccurs='1' name='DvCount-units' type='xs:string' fixed='Breathes Per Minute'>
=== modified file 'src/instance-gen/ccd-ca92a9c1-275f-42ca-b1a0-ac0a20cb2ec9.xsd'
--- src/instance-gen/ccd-ca92a9c1-275f-42ca-b1a0-ac0a20cb2ec9.xsd 2012-12-20 12:34:40 +0000
+++ src/instance-gen/ccd-ca92a9c1-275f-42ca-b1a0-ac0a20cb2ec9.xsd 2013-02-16 23:57:14 +0000
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:mlhim2="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
- elementFormDefault="qualified"
- targetNamespace="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
- xmlns:data-view="http://www.w3.org/2003/g/data-view#";
- data-view:transformation="http://www.mlhim.org/ccd/ccd_md_view.xsl";>
-
+ xmlns:mlhim2="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:dc= "http://purl.org/dc/elements/1.1/";
+ elementFormDefault="qualified"
+ targetNamespace="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
+ xmlns:data-view="http://www.w3.org/2003/g/data-view#";
+ data-view:transformation="http://www.mlhim.org/ccd/ccd_md_view.xsl";>
+
<xs:annotation>
<xs:appinfo>
@@ -53,7 +55,6 @@
<xs:sequence>
<xs:element maxOccurs='unbounded' minOccurs='0' ref='mlhim2:links'/>
<xs:element maxOccurs='1' minOccurs='0' ref='mlhim2:feeder-audit'/>
- <xs:element maxOccurs='1' minOccurs='0' name='annotation' type='xs:string'/>
<xs:element maxOccurs='1' minOccurs='1' name='cluster-subject' type='xs:string' fixed='Demographics Cluster'/>
<xs:element maxOccurs='1' minOccurs='1' ref='mlhim2:el-a2bc25db-3111-4cd5-9825-d9c448cdd1a5'/>
</xs:sequence>
@@ -113,7 +114,7 @@
<xs:element maxOccurs='1' minOccurs='0' ref='mlhim2:ExceptionalValue'/>
<xs:element maxOccurs='1' minOccurs='0' name='valid-time-begin' type='xs:dateTime'/>
<xs:element maxOccurs='1' minOccurs='0' name='valid-time-end' type='xs:dateTime'/>
- <xs:element maxOccurs='1' minOccurs='1' name='DvString-dv' type='xs:string' >
+ <xs:element maxOccurs='1' minOccurs='1' name='DvString-dv' type='xs:string' rdf:resource="http://purl.bioontology.org/ontology/SNOMEDCT/152323006";>
<xs:annotation>
<xs:documentation>
Gender
=== modified file 'src/instance-gen/ccd-fa706c7a-f08a-4c80-8ce3-8ab7e2699517.xsd'
--- src/instance-gen/ccd-fa706c7a-f08a-4c80-8ce3-8ab7e2699517.xsd 2012-12-20 12:34:40 +0000
+++ src/instance-gen/ccd-fa706c7a-f08a-4c80-8ce3-8ab7e2699517.xsd 2013-02-16 23:57:14 +0000
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:mlhim2="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
- elementFormDefault="qualified"
- targetNamespace="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
- xmlns:data-view="http://www.w3.org/2003/g/data-view#";
- data-view:transformation="http://www.mlhim.org/ccd/ccd_md_view.xsl";>
-
+ xmlns:mlhim2="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:dc= "http://purl.org/dc/elements/1.1/";
+ elementFormDefault="qualified"
+ targetNamespace="http://www.mlhim.org/xmlns/mlhim2/2_4_1";
+ xmlns:data-view="http://www.w3.org/2003/g/data-view#";
+ data-view:transformation="http://www.mlhim.org/ccd/ccd_md_view.xsl";>
+
<xs:annotation>
<xs:appinfo>
@@ -92,7 +94,6 @@
<xs:sequence>
<xs:element maxOccurs='unbounded' minOccurs='0' ref='mlhim2:links'/>
<xs:element maxOccurs='1' minOccurs='0' ref='mlhim2:feeder-audit'/>
- <xs:element maxOccurs='1' minOccurs='0' name='annotation' type='xs:string'/>
<xs:element maxOccurs='1' minOccurs='1' name='cluster-subject' type='xs:string' fixed='Care Cluster'/>
<xs:element maxOccurs='1' minOccurs='1' ref='mlhim2:el-0c71fe4c-8dd2-4d0f-af05-15b5b7b9de24'/>
</xs:sequence>
=== modified file 'src/xls2ccd/examples/cluster-example/ccd-f9493153-8960-4974-8725-3bf824319ac8.xsd'
--- src/xls2ccd/examples/cluster-example/ccd-f9493153-8960-4974-8725-3bf824319ac8.xsd 2012-09-26 19:50:07 +0000
+++ src/xls2ccd/examples/cluster-example/ccd-f9493153-8960-4974-8725-3bf824319ac8.xsd 2013-02-16 23:57:14 +0000
@@ -154,7 +154,7 @@
<xs:complexContent>
<xs:restriction base="mlhim2:DvTimeType">
<xs:sequence>
- <xs:element maxOccurs="1" minOccurs="1" name="data-name" type="xs:string" fixed="Start Time"/>
+ <xs:element maxOccurs="1" minOccurs="1" name="data-name" type="xs:string" fixed="Start Time" />
<xs:element maxOccurs="1" minOccurs="0" ref="mlhim2:ExceptionalValue"/>
<xs:element maxOccurs="1" minOccurs="0" name="valid-time-begin" type="xs:dateTime"/>
<xs:element maxOccurs="1" minOccurs="0" name="valid-time-end" type="xs:dateTime"/>
