mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 276
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: cdd
timestamp: Mon 2012-10-01 18:08:37 -0300
message:
  Added AdminEntry and DemographicEntry to xls2ccd.  Updated example demographic template to accommodate Entry types.
modified:
  src/xls2ccd/examples/Demography/MLHIM_Std_Template-NCI-Demographics.xls
  src/xls2ccd/xls2ccd.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/xls2ccd/examples/Demography/MLHIM_Std_Template-NCI-Demographics.xls'
Binary files src/xls2ccd/examples/Demography/MLHIM_Std_Template-NCI-Demographics.xls	2012-09-23 11:57:38 +0000 and src/xls2ccd/examples/Demography/MLHIM_Std_Template-NCI-Demographics.xls	2012-10-01 21:08:37 +0000 differ
=== modified file 'src/xls2ccd/xls2ccd.py'
--- src/xls2ccd/xls2ccd.py	2012-09-30 10:20:23 +0000
+++ src/xls2ccd/xls2ccd.py	2012-10-01 21:08:37 +0000
@@ -68,7 +68,6 @@
 bool_vals = []
 defin_type = None
 
-
 for row in range(1,s.nrows):
     values = []
     for col in range(s.ncols):
@@ -239,6 +238,13 @@
         indent = 4
         xsd_file.write(xls2ccdRM.getCareEntryType(data_name, defin_id, dt_docs, dt_id, e_data_type, indent))
 
+    elif defin_type[0] == "DemographicEntryType":
+        indent = 4
+        xsd_file.write(xls2ccdRM.getDemographicEntryType(data_name, defin_id, dt_docs, dt_id, e_data_type, indent))
+    elif defin_type[0] == "AdminEntryType":
+        indent = 4
+        xsd_file.write(xls2ccdRM.getAdminEntryType(data_name, defin_id, dt_docs, dt_id, e_data_type, indent))
+
 
     if dt == "DvBooleanType":
         default = None