Commit 37b424ba authored by aknecht2's avatar aknecht2
Browse files

Fixed minor issues in workflow job & workflow module.:

parent 7f293def
......@@ -450,7 +450,7 @@ class WorkflowJob(object):
"""
if self._params_are_valid(inputs, outputs):
job = Job(self.executable)
for file_name, file_info in self.raw_files:
for file_name, file_info in self.raw_files.iteritems():
job.uses(file_info["file"], link=Link.INPUT)
for param_name, param_info in inputs.iteritems():
wj_param = self.get_param_info(param_name)
......
......@@ -38,6 +38,7 @@ class WorkflowModule(object):
except:
self.err += "Error parsing module template yaml file %s.\n" % (module_yaml, )
self.err += traceback.format_exc()
print self.err
try:
self.name = self.data.keys()[0]
self.markers = {}
......@@ -398,9 +399,7 @@ class WorkflowModule(object):
job_name = job_dict.keys()[0]
job_info = job_dict[job_name]
if job_info.get("outputs"):
for file_dict in job_info["outputs"]:
file_name = file_dict.keys()[0]
file_info = file_dict[file_name]
for file_name, file_info in job_info["outputs"].iteritems():
if file_info.get("final_result"):
final_results.append({
"job_names": [job.keys()[0] for job in job_list[:i + 1]],
......
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