mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 223
committer: Eduardo C. P. Ribeiro <eduardo.cesar@xxxxxxx>
branch nick: cdd
timestamp: Sun 2012-08-26 10:17:32 -0300
message:
  Changed so that the root tag is the ccd_id and the complextType has a ct_ name like other complexTypes.
modified:
  src/cdd_version.py
  src/cdg_main.py


--
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/cdd_version.py'
--- src/cdd_version.py	2012-08-04 07:05:44 +0000
+++ src/cdd_version.py	2012-08-26 13:17:32 +0000
@@ -1,2 +1,2 @@
-REVNO = 214
+REVNO = 222
 VERSION = '2.3.0 Rev. %d' % (int(REVNO) + 1)

=== modified file 'src/cdg_main.py'
--- src/cdg_main.py	2012-08-07 15:27:49 +0000
+++ src/cdg_main.py	2012-08-26 13:17:32 +0000
@@ -450,6 +450,7 @@
 
         UUID_definition = "ct_"+str(uuid.uuid4()).replace('-','_')
         UUID_string = "ct_"+str(uuid.uuid4()).replace('-','_')
+        UUID_complex = "ct_"+str(uuid.uuid4()).replace('-','_')
 
         schema = self.ccd_id + ".xsd"
 
@@ -499,8 +500,8 @@
 
   <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/mlhim2.xsd"/>
 
-  <xs:element name='CCD' type="mlhim2:{ccd_id}"/>
-  <xs:complexType name="{ccd_id}">
+  <xs:element name="{ccd_id}" type="mlhim2:{UUID_complex}"/>
+  <xs:complexType name="{UUID_complex}">
     <xs:complexContent>
     <xs:restriction base="mlhim2:CCDType">
 	<xs:sequence>
@@ -514,6 +515,7 @@
 """.format(ccd_id = self.ccd_id,
            UUID_definition = UUID_definition,
            UUID_DvString = UUID_string,
+           UUID_complex = UUID_complex,
 
            title = escape(self.title),
            description = escape(self.description),