Commit 3d21b860 authored by aknecht2's avatar aknecht2
Browse files

Updated workflow_job to use file names instead of file objects.

parent 26f62368
......@@ -488,7 +488,11 @@ class WorkflowJob(object):
for i, fname in enumerate(arg_value):
if "$inputs" in fname:
index = int(fname.split(".")[1])
add_value.append(argument_map["$inputs"][index]["file"])
print "name: %s, pegasus.file.name: %s" % (
argument_map["$inputs"][index]["name"],
argument_map["$inputs"][index]["file"].name
)
add_value.append(argument_map["$inputs"][index]["name"])
else:
add_value.append(fname)
elif isinstance(arg_value, str) and has_args.search(arg_value) is not None:
......@@ -516,12 +520,10 @@ class WorkflowJob(object):
elif isinstance(add_value, list):
arg_list.append(arg_name)
if "separator" in arg_info:
arg_list.append(arg_info["separator"].join([
str(f.toArgumentXML()) for f in add_value
])
arg_list.append(arg_info["separator"].join(add_value))
else:
for f in add_value:
arg_list.append(add_value)
arg_list.append(f)
else:
arg_list.append("%s %s" % (arg_name, add_value))
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