Prechádzať zdrojové kódy

Merge branch 'dev' of lab/parse-edi into master

steve 4 rokov pred
rodič
commit
7c2b2908eb
2 zmenil súbory, kde vykonal 4 pridanie a 2 odobranie
  1. 3 1
      healthcareio/healthcare-io.py
  2. 1 1
      setup.py

+ 3 - 1
healthcareio/healthcare-io.py

@@ -44,6 +44,7 @@ from multiprocessing import Process
 import time
 from healthcareio import x12
 import smart
+from healthcareio.server import proxy
 import pandas as pd
 
 PATH = os.sep.join([os.environ['HOME'],'.healthcareio'])
@@ -253,7 +254,8 @@ if __name__ == '__main__' :
         # if the user has specified to resume, we should look into the logs and pull the files processed and those that haven't
         #
         if 'resume' in SYS_ARGS :
-            files = resume(files,SYS_ARGS['parse'],info)
+            store_config = json.loads( (open(os.sep.join([PATH,'config.json']))).read() )
+            files = proxy.get.resume(files,store_config )
             print (["Found ",len(files)," files unprocessed"])
         #
         # @TODO: Log this here so we know what is being processed or not

+ 1 - 1
setup.py

@@ -8,7 +8,7 @@ import sys
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read() 
 args = {
-    "name":"healthcareio","version":"1.4.2",
+    "name":"healthcareio","version":"1.4.4",
     "author":"Vanderbilt University Medical Center",
     "author_email":"steve.l.nyemba@vumc.org",
     "license":"MIT",