mlhim-specs-dev team mailing list archive
-
mlhim-specs-dev team
-
Mailing list archive
-
Message #00744
[Branch ~cdd-dev/cdd/trunk] Rev 264: xls2ccd.py is executing again though not all CCDs are valid; i.e. CareEntryType, etc.
------------------------------------------------------------
revno: 264
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: cdd
timestamp: Sun 2012-09-23 15:19:22 -0300
message:
xls2ccd.py is executing again though not all CCDs are valid; i.e. CareEntryType, etc.
modified:
src/xls2ccd/mlhim2RM.py
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/mlhim2RM.py'
--- src/xls2ccd/mlhim2RM.py 2012-09-23 11:57:38 +0000
+++ src/xls2ccd/mlhim2RM.py 2012-09-23 18:19:22 +0000
@@ -235,15 +235,16 @@
defin_str += padding.rjust(indent+4) + ("</xs:restriction>\n")
defin_str += padding.rjust(indent+2) + ("</xs:complexContent>\n")
defin_str += padding.rjust(indent) + ("</xs:complexType>\n")
- dt_str += padding.rjust(indent+2) + ("<xs:element name='el-"+ed_id+"' substitutionGroup='mlhim2:entry-data' type='mlhim2:ct-"+ed_id+"'/>\n")
- dt_str += padding.rjust(indent+2) + ("<xs:element name='el-"+es_id+"' substitutionGroup='mlhim2:entry-subject' type='mlhim2:ct-"+es_id+"'/>\n")
+ defin_str += padding.rjust(indent+2) + ("<xs:element name='el-"+ed_id+"' substitutionGroup='mlhim2:entry-data' type='mlhim2:ct-"+ed_id+"'/>\n")
+ defin_str += padding.rjust(indent+2) + ("<xs:element name='el-"+es_id+"' substitutionGroup='mlhim2:entry-subject' type='mlhim2:ct-"+es_id+"'/>\n")
if e_subject_type == "PartyIdentifiedType":
pass #TODO for CDD
- elif e_data_type == "PartySelfType":
+ elif e_subject_type == "PartySelfType":
defin_str += getPartSelfType(indent)
else:
- raise TypeError(e_subject_type + ": is not a valid CareEntry.entry-subject type.")
+ print e_subject_type + ": is not a valid CareEntry.entry-subject type."
+ exit()
if e_data_type == "ElementType":
pass #TODO for CDD
@@ -256,6 +257,8 @@
return(defin_str)
+def getClusterType(data_name, edid, dt_id, indent):
+ return "\n\n<!-- ClusterType -->\n\n"
def getDvBooleanType(data_name, ct_name, bool_values, docs, indent=0):
"""
@@ -746,7 +749,7 @@
defin_str += padding.rjust(indent+2) + ("<xs:complexContent>\n")
defin_str += padding.rjust(indent+4) + ("<xs:restriction base='mlhim2:ElementType'>\n")
defin_str += padding.rjust(indent+6) + ("<xs:sequence>\n")
- defin_str += padding.rjust(indent+8) + ("<xs:element maxOccurs='1' minOccurs='1' ref='mlhim2:el-"+d_id+"'/>\n")
+ defin_str += padding.rjust(indent+8) + ("<xs:element maxOccurs='1' minOccurs='1' ref='mlhim2:el-"+dt_id+"'/>\n")
defin_str += padding.rjust(indent+6) + ("</xs:sequence>\n")
defin_str += padding.rjust(indent+4) + ("</xs:restriction>\n")
defin_str += padding.rjust(indent+2) + ("</xs:complexContent>\n")
@@ -755,6 +758,8 @@
return defin_str
+def getPartSelfType(indent):
+ return "\n\n<!-- PartySelfType -->\n\n"
def getReferenceRangeType(data_name, ct_name, rr_def, dvi_list, docs, indent):
"""
=== modified file 'src/xls2ccd/xls2ccd.py'
--- src/xls2ccd/xls2ccd.py 2012-09-23 11:57:38 +0000
+++ src/xls2ccd/xls2ccd.py 2012-09-23 18:19:22 +0000
@@ -21,11 +21,14 @@
try:
xlsfile = sys.argv[1]
except:
- print "Please include the .xls filename on the commandline."
+ print "\n\nPlease include a valid .xls filename on the commandline.\n\n"
exit()
+try:
+ wb = open_workbook(xlsfile)
+except:
+ print "\n\nThere was an error opening the file: "+xlsfile+"\n\n"
-wb = open_workbook(xlsfile)
ccd_dict = {}
currkey = ''
n = time.localtime()
@@ -38,15 +41,19 @@
elements = mlhim2RM.get_map()[1].keys()
ufile = open('uuid_list.txt','a')
-ufile.write('UUIDs for use in complexType and element names:\n')
+ufile.write('UUIDs for use in additional complexType and element names:\n')
for x in range(0,20):
ufile.write('\n'+str(uuid.uuid4()))
-
ufile.close()
xsd = ".xsd"
-s = wb.sheet_by_name("Data")
+try:
+ s = wb.sheet_by_name("Data")
+except:
+ print "\n\nThere was an error opening the 'Data' sheet. Maybe "+xlsfile+" isn't a valid MLHIM Template?\n\n"
+ exit()
+
print 'Sheet:',s.name
print 'Cols.: ',s.ncols
print 'Rows: ', s.nrows
@@ -228,7 +235,7 @@
if dt == "DvBooleanType":
default = None
indent = 4
- xsd_file.write(mlhim2RM.getDvBooleanType(data_name, d_id, bool_vals, dt_docs, indent))
+ xsd_file.write(mlhim2RM.getDvBooleanType(data_name, dt_id, bool_vals, dt_docs, indent))
bool_vals = [] #reset
@@ -237,18 +244,18 @@
indent = 4
dvi_list = []
rr_def = ''
- xsd_file.write(mlhim2RM.getDvCountType(data_name, d_id, uom, dt_docs, rr_def, dvi_list, indent))
+ xsd_file.write(mlhim2RM.getDvCountType(data_name, dt_id, uom, dt_docs, rr_def, dvi_list, indent))
elif dt == "DvDateType":
default = None
indent = 4
- xsd_file.write(mlhim2RM.getDvDateType(data_name, d_id, default, dt_docs, indent))
+ xsd_file.write(mlhim2RM.getDvDateType(data_name, dt_id, default, dt_docs, indent))
elif dt == "DvTimeType":
default = None
indent = 4
- xsd_file.write(mlhim2RM.getDvTimeType(data_name, d_id, default, dt_docs, indent))
+ xsd_file.write(mlhim2RM.getDvTimeType(data_name, dt_id, default, dt_docs, indent))
elif dt == "DvQuantityType":
@@ -264,7 +271,7 @@
tc.append(ccd_dict[k][18][n][3])
cs.append(ccd_dict[k][18][n][4])
indent = 4
- xsd_file.write(mlhim2RM.getDvQuantityType(data_name, d_id, dt_docs, indent,ta,tn,tv,tc,cs))
+ xsd_file.write(mlhim2RM.getDvQuantityType(data_name, dt_id, dt_docs, indent,ta,tn,tv,tc,cs))
elif dt =="DvCodedStringType":
ta=[]
@@ -279,7 +286,7 @@
tc.append(ccd_dict[k][18][n][3])
cs.append(ccd_dict[k][18][n][4])
indent = 4
- xsd_file.write(mlhim2RM.getDvCodedStringType(data_name, d_id, dt_docs, indent,ta,tn,tv,tc,cs))
+ xsd_file.write(mlhim2RM.getDvCodedStringType(data_name, dt_id, dt_docs, indent,ta,tn,tv,tc,cs))
elif dt =="DvStringType":
@@ -292,7 +299,7 @@
default = None
indent = 4
- xsd_file.write(mlhim2RM.getDvStringType(data_name, d_id, default, dt_docs, indent,enumList))
+ xsd_file.write(mlhim2RM.getDvStringType(data_name, dt_id, default, dt_docs, indent,enumList))
else:
xsd_file.write("\n\n\n<!-- ***** DataType Not Yet Implemented: " +dt+ " ***** -->\n\n")
