mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 293
committer: Eduardo Ribeiro <xcesar@xxxxxxxxx>
branch nick: devel
timestamp: Fri 2012-12-28 17:35:52 -0200
message:
  Added CareEntry AdminEntry and DemographicEntry generation when selected
modified:
  src/2.0/cdd.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/2.0/cdd.py'
--- src/2.0/cdd.py	2012-12-28 15:58:13 +0000
+++ src/2.0/cdd.py	2012-12-28 19:35:52 +0000
@@ -2403,6 +2403,12 @@
             defin_id = UUID_definition
             dt_id = str(uuid.uuid4())
 
+            e_data_type = "ClusterType"
+            #data_name = title.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace("'", '&#39;').replace('"', '&quot;')
+            data_name = escape(self.title)
+            dt_docs = escape(self.description)
+            
+
             import xls2ccdRM
 
             complexTypes = xls2ccdRM.get_map()[0].keys()
@@ -2412,14 +2418,14 @@
             if defin_type[0] == "ElementType":
                 xsd_file.write(xls2ccdRM.getElementType(defin_id, dt_id, indent))
 
-            # elif defin_type[0] == "CareEntryType":
-            #     xsd_file.write(xls2ccdRM.getCareEntryType(data_name, defin_id, dt_docs, dt_id, e_data_type, indent))
+            elif defin_type[0] == "CareEntryType":
+                xsd_file.write(xls2ccdRM.getCareEntryType(data_name, defin_id, dt_docs, dt_id, e_data_type, indent))
 
-            # elif defin_type[0] == "DemographicEntryType":
-            #     xsd_file.write(xls2ccdRM.getDemographicEntryType(data_name, defin_id, dt_docs, dt_id, e_data_type, indent))
+            elif defin_type[0] == "DemographicEntryType":
+                xsd_file.write(xls2ccdRM.getDemographicEntryType(data_name, defin_id, dt_docs, dt_id, e_data_type, indent))
                 
-            # elif defin_type[0] == "AdminEntryType":
-            #     xsd_file.write(xls2ccdRM.getAdminEntryType(data_name, defin_id, dt_docs, dt_id, e_data_type, indent))
+            elif defin_type[0] == "AdminEntryType":
+                xsd_file.write(xls2ccdRM.getAdminEntryType(data_name, defin_id, dt_docs, dt_id, e_data_type, indent))
 
 ########################################################################
         xsd_file.write("\n</xs:schema>\n<!-- Here are some UUIDs to use for complexType & element names:\n\n")