Commit 54d82fd5 authored by aknecht2's avatar aknecht2
Browse files

Fixed job_info errors in workflow_module.

parent 992834cf
......@@ -118,9 +118,11 @@ class WorkflowModule(object):
additional_files = []
output_files = []
job_list = self._get_data_list(self.workflow, markers)
for job_info in job_list:
for job_dict in job_list:
job_name = job_dict.keys()[0]
job_info = job_dict[job_name]
for file_type, file_list in zip(["inputs", "additional_inputs", "outputs"], [input_files, additional_files, output_files]):
if job_info[ftype] is not None:
if job_info[file_type] is not None:
for file_id in job_info[file_type]:
if file_id not in file_list and file_id not in output_files:
if prefix is None or self._get_full_name(prefix, markers, file_id) in master_files:
......@@ -175,7 +177,9 @@ class WorkflowModule(object):
def _traverse_jobs(self, dax, master_jobs, master_files, prefix, markers, input_files, additional_files):
job_list = self._get_data_list(self.workflow, markers)
for job_info in job_list:
for job_dict in job_list:
job_name = job_dict.keys()[0]
job_info = job_dict[job_name]
job_inputs = []
job_additional = []
job_inputs = self._setup_file_list(master_files, job_info, "inputs", input_files, prefix, markers)
......@@ -185,7 +189,7 @@ class WorkflowModule(object):
full_name = self._get_full_name(prefix, markers, file_id)
master_files[full_name] = File(full_name)
job_outputs.append({"name": full_name, "file": master_files[full_name]})
job = self.workflow_jobs[key].create_job(job_inputs, job_additional, job_outputs)
job = self.workflow_jobs[job_name].create_job(job_inputs, job_additional, job_outputs)
if job is not None:
dax.addJob(job)
else:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment