mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 272
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: cdd
timestamp: Sun 2012-09-30 07:20:23 -0300
message:
  Docs for ccd2hkcr, corrected error in xls2ccdRM DvCodedStringType, license statements.
removed:
  src/ccd2hkcr/ccd2hkcr.cfg
  src/ccd2hkcr/demo-ccd2hkcr.cfg
added:
  src/ccd2hkcr/README.txt
  src/ccd2hkcr/default-ccd2hkcr.cfg
modified:
  src/ccd2hkcr/ccd2hkcr.py
  src/xls2ccd/examples/ExampleTemplate/MLHIM_Std_Template-Examples.xls
  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

=== added file 'src/ccd2hkcr/README.txt'
--- src/ccd2hkcr/README.txt	1970-01-01 00:00:00 +0000
+++ src/ccd2hkcr/README.txt	2012-09-30 10:20:23 +0000
@@ -0,0 +1,36 @@
+ccd2hkcr.py
+
+********* Please read all of this short document *********
+
+
+REQUIRES: Python 2.6/2.7
+
+======================================= The Stuff You Came For  =======================================
+
+ccd2hkcr.py  is used to upload CCDs to the Healthcare Knowledge Component Repository.  
+You may optionally upload CCDs manually and then edit the metadata on the site.  This tool just makes it easier and faster
+to contribute.  It is especially useful when used in conjunction with xls2ccd.py
+
+Create an account on http://www.hkcr.net 
+You will have a private folder as your workspace.  You may upload CCDS for sharing with others or publication.  You may also upload
+CDD Template (XMind) files to share and collaborate with others.  You may enter domain interests in the biography area of
+personal information to help locate collaborators in a subject area. 
+
+Edit default-ccd2hkcr.cfg with your username (email) and password and save it as ccd2hkcr.cfg.
+You can now use the tool to login and auto upload your CCDs.  You will still need to manually Submit them for publication.
+Either one by one or go to the contents view of your folder and select them all to submit at one time. 
+  
+
+----------------------------------------------------------------------------------------------------------------
+Direct all questions to: 
+Preferred: https://launchpad.net/~mlhim-owners mailing list.
+
+Tim Cook timothywayne.cook@xxxxxxxxx
+Dr. Luciana Cavalini  lutricav@xxxxxxxxxxxxxxx
+NOTE: all questions directly to Tim or Luciana will be CC'd in reply to the mailing list 
+in order to inform and promote project documentation.  
+
+
+
+
+

=== removed file 'src/ccd2hkcr/ccd2hkcr.cfg'
--- src/ccd2hkcr/ccd2hkcr.cfg	2012-09-26 23:28:04 +0000
+++ src/ccd2hkcr/ccd2hkcr.cfg	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# Enter your HKCR.net username and password, save this file as ccd2hkcr.cfg
-# do not remove the text to the left of the ':', do not add/delete any lines.
-host:www.hkcr.net/HKCR
-user:admin
-password:abc123

=== modified file 'src/ccd2hkcr/ccd2hkcr.py'
--- src/ccd2hkcr/ccd2hkcr.py	2012-09-26 19:50:07 +0000
+++ src/ccd2hkcr/ccd2hkcr.py	2012-09-30 10:20:23 +0000
@@ -151,11 +151,11 @@
                       #'relatedItems':None,
                       #'expirationsDate':None,
                       'allowDiscussion': True,
-                      'excludeFromNav': False,
+                      'excludeFromNav': True,
                       'id':filename,
                       'location': dc_coverage}
         if PUSH != "FAKEIT":
-            print "Sending: "+ dc_title + ' -- '+filename + ' to '+ push_location
+            print "Sending: "+ dc_title + ' --  to '+ push_location
             client.post_object({push_location:[ccd_object, 'File']})
         else:
             print "Fake Sending: "+ dc_title + ' -- '+filename

=== added file 'src/ccd2hkcr/default-ccd2hkcr.cfg'
--- src/ccd2hkcr/default-ccd2hkcr.cfg	1970-01-01 00:00:00 +0000
+++ src/ccd2hkcr/default-ccd2hkcr.cfg	2012-09-30 10:20:23 +0000
@@ -0,0 +1,5 @@
+# Enter your HKCR.net username and password, save this file as ccd2hkcr.cfg
+# do not remove the text to the left of the ':', do not add/delete any lines.
+host:www.hkcr.net/HKCR
+user:admin
+password:abc123

=== removed file 'src/ccd2hkcr/demo-ccd2hkcr.cfg'
--- src/ccd2hkcr/demo-ccd2hkcr.cfg	2012-09-26 23:28:04 +0000
+++ src/ccd2hkcr/demo-ccd2hkcr.cfg	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# Enter your HKCR.net username and password, save this file as ccd2hkcr.cfg
-# do not remove the text to the left of the ':', do not add/delete any lines.
-host:www.hkcr.net/HKCR
-user:admin
-password:abc123

=== modified file 'src/xls2ccd/examples/ExampleTemplate/MLHIM_Std_Template-Examples.xls'
Binary files src/xls2ccd/examples/ExampleTemplate/MLHIM_Std_Template-Examples.xls	2012-09-27 21:19:38 +0000 and src/xls2ccd/examples/ExampleTemplate/MLHIM_Std_Template-Examples.xls	2012-09-30 10:20:23 +0000 differ
=== modified file 'src/xls2ccd/xls2ccd.py'
--- src/xls2ccd/xls2ccd.py	2012-09-27 21:19:38 +0000
+++ src/xls2ccd/xls2ccd.py	2012-09-30 10:20:23 +0000
@@ -47,7 +47,7 @@
 complexTypes = xls2ccdRM.get_map()[0].keys()
 elements = xls2ccdRM.get_map()[1].keys()
 
-ufile = open('uuid_list.txt','a')
+ufile = open('ccd_uuids.txt','a')
 ufile.write('UUIDs for use in additional complexType and element names:\n')
 for x in range(0,20):
     ufile.write('\n'+str(uuid.uuid4()))
@@ -75,7 +75,7 @@
         values.append(s.cell(row,col).value)
     if values[9]:  #title, must be unique
         currkey = values[9]
-        print values[9], values[27]
+        print values[9]
         ccd_dict[currkey] = [values[0],values[1],values[2],values[3],values[4],values[5],values[6],values[7],values[8],values[9],values[10],values[11],values[12],values[13],values[14],values[15],values[16],[],[],[]] # New Entry values
     else:
         if values[17]: #DvString Enumerations
@@ -86,7 +86,8 @@
         elif values[25] != '': #DvBoolean true/false values
             bool_vals.append((values[25],values[26]))
 
-    if values[27]:  #Is there an EntryType?
+      #Is there an EntryType?
+    if values[27] in ["AdminEntryType","CareEntryType","DemographicEntryType"]:
         ccd_dict[currkey][19].append(values[27])
 
 for k in ccd_dict.keys():

=== modified file 'src/xls2ccd/xls2ccdRM.py'
--- src/xls2ccd/xls2ccdRM.py	2012-09-27 21:19:38 +0000
+++ src/xls2ccd/xls2ccdRM.py	2012-09-30 10:20:23 +0000
@@ -351,7 +351,7 @@
     dt_str += padding.rjust(indent+10) + ("<xs:simpleType>\n")
     dt_str += padding.rjust(indent+12) + ("<xs:restriction base='xs:string'>\n")
     for n in range(len(cs)):
-        dt_str += padding.rjust(indent+14) + ("<xs:enumeration value='"+cs[0]+"'/>\n")
+        dt_str += padding.rjust(indent+14) + ("<xs:enumeration value='"+cs[n]+"'/>\n")
 
     dt_str += padding.rjust(indent+12) + ("</xs:restriction>\n")
     dt_str += padding.rjust(indent+10) + ("</xs:simpleType>\n")