Merge pull request #236 from VUIIS/fix_issues

Fix issues

bin/Xnat_tools/Xnatdl

@@ -186,7 +186,8 @@ download_report.csv if you want to start from scratch."""
             for project in projects_list:
                 self.scans.extend(self.xnat.get_project_scans(project))
                 if XnatUtils.has_dax_datatypes(self.xnat):
-                    self.assessors.extend(xnat.list_project_assessors(project))
+                    self.assessors.extend(self.xnat.list_project_assessors(
+                        project))
 
             # Filter using the options if they are set only if full project:
             self.filter(args)

dax/dax_manager.py

@@ -265,8 +265,9 @@ def load_module_record(self, module, project):
         dax_rec['filepath'] = rc_rec[file_key]
 
         # Parse arguments
-        if rc_rec[key_prefix + '_args']:
-            rlist = rc_rec[key_prefix + '_args'].strip().split('\r\n')
+        args_key = key_prefix + '_args'
+        if rc_rec[args_key] and len(rc_rec[args_key]) > 0:
+            rlist = rc_rec[args_key].strip().split('\r\n')
             rdict = {}
             for arg in rlist:
                 key, val = arg.split(':', 1)

dax/launcher.py

@@ -980,7 +980,7 @@ def get_assessors_list(xnat, project_id, slocal):
         :return: list of assessors for a project
         """
         # Get lists of assessors for this project
-        assr_list = XnatUtils.list_project_assessors(xnat, project_id)
+        assr_list = xnat.list_project_assessors(project_id)
 
         # filter the assessors to the sessions given as parameters if given
         if slocal and slocal.lower() != 'all':

dax/task.py

@@ -1348,9 +1348,10 @@ def complete_task(self):
         # Move output file
         src = self.outlog_path()
         dst = self.upload_outlog_dir()
-        mkdirp(dst)
-        LOGGER.debug('moving outlog file from %s to %s' % (src, dst))
-        shutil.move(src, dst)
+        if os.path.exists(src):
+            mkdirp(dst)
+            LOGGER.debug('moving outlog file from %s to %s' % (src, dst))
+            shutil.move(src, dst)
 
         # Touch file for dax_upload to check
         create_flag(os.path.join(RESULTS_DIR, self.assessor_label,