mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 279
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: cdd
timestamp: Thu 2012-10-18 11:43:48 -0300
message:
  Fixed bug in Cluster Subject, missing quotes.
modified:
  src/xls2ccd/xls2ccd.py
  src/xls2ccd/xls2ccdRM.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/xls2ccd.py'
--- src/xls2ccd/xls2ccd.py	2012-10-01 21:08:37 +0000
+++ src/xls2ccd/xls2ccd.py	2012-10-18 14:43:48 +0000
@@ -313,8 +313,10 @@
 
         default = None
         indent = 4
-        xsd_file.write(xls2ccdRM.getDvStringType(data_name, dt_id, default, dt_docs, indent,enumList))
-
+        try:
+            xsd_file.write(xls2ccdRM.getDvStringType(data_name, dt_id, default, dt_docs, indent,enumList))
+        except UnicodeEncodeError:
+            print "*********UNICODE ERROR************", enumList
     else:
         xsd_file.write("\n\n\n<!-- ***** DataType Not Yet Implemented: " +dt+ " ***** -->\n\n")
         xsd_file.write(repr(ccd_dict[k]))

=== modified file 'src/xls2ccd/xls2ccdRM.py'
--- src/xls2ccd/xls2ccdRM.py	2012-10-02 13:00:19 +0000
+++ src/xls2ccd/xls2ccdRM.py	2012-10-18 14:43:48 +0000
@@ -218,7 +218,7 @@
     defin_str += padding.rjust(indent+8) + ("<xs:element maxOccurs='unbounded' minOccurs='0' ref='mlhim2:links'/>\n")
     defin_str += padding.rjust(indent+8) + ("<xs:element maxOccurs='1' minOccurs='0' ref='mlhim2:feeder-audit'/>\n")
     defin_str += padding.rjust(indent+8) + ("<xs:element maxOccurs='1' minOccurs='0' name='annotation' type='xs:string'/>\n")
-    defin_str += padding.rjust(indent+8) + ("<xs:element maxOccurs='1' minOccurs='1' name='cluster-subject' type='xs:string' fixed="+cluster_subject+"/>\n")
+    defin_str += padding.rjust(indent+8) + ("<xs:element maxOccurs='1' minOccurs='1' name='cluster-subject' type='xs:string' fixed='"+cluster_subject+"'/>\n")
     defin_str += padding.rjust(indent+8) + ("<xs:element maxOccurs='1' minOccurs='1' ref='mlhim2:el-"+il_id+"'/>\n")
     defin_str += padding.rjust(indent+6) + ("</xs:sequence>\n")
     defin_str += padding.rjust(indent+4) + ("</xs:restriction>\n")