Commit 1dfadbdf authored by Jerome Mariette's avatar Jerome Mariette
Browse files

no output file available from Wf class

parent de090710
......@@ -134,25 +134,6 @@ class Workflow(threading.Thread):
else:
self.params_order.append(name)
self.__setattr__(name, new_param)
def add_output_file(self, name, help, file_format="any", default=None, choices=None, required=False,
flag=None, group="default", display_name=None, is_list=False, add_to=None):
if is_list:
if default == None: default = []
new_param = OutputFileList(name, help, flag=flag, file_format=file_format, default=default, type="localfile",
choices=choices, required=required, group=group, display_name=display_name)
else:
new_param = OutputFile(name, help, flag=flag, file_format=file_format, default=default, type="localfile",
choices=choices, required=required, group=group, display_name=display_name)
# if this input should be added to a particular parameter
if add_to:
try:
self.__getattribute__(add_to).add_sub_parameter(new_param)
except: pass
# otherwise, add it to the class itself
else:
self.params_order.append(name)
self.__setattr__(name, new_param)
def add_multiple_parameter(self, name, help, required=False, flag=None, group="default", display_name=None, is_list=False):
self.params_order.append(name)
......@@ -258,11 +239,6 @@ class Workflow(threading.Thread):
choices=param.choices, required=param.required, flag=param.flag,
group=param.group, display_name=param.display_name)
self.__setattr__(param.name, new_param)
elif param.__class__ == OutputFile:
new_param = OutputFile(param.name, param.help, file_format=param.file_format, default=args[param.name], type=param.type,
choices=param.choices, required=param.required, flag=param.flag,
group=param.group, display_name=param.display_name)
self.__setattr__(param.name, new_param)
elif param.__class__ == InputFileList:
# handle url inputs
default_vals, is_uri = [], False
......@@ -283,7 +259,7 @@ class Workflow(threading.Thread):
else:
default_vals.append(os.path.join(self.jflow_config_reader.get_tmp_directory(), (args[param.name])))
self.__getattribute__(param.name).extend(default_vals)
elif param.__class__ == ParameterList or param.__class__ == OutputFileList:
elif param.__class__ == ParameterList:
self.__getattribute__(param.name).extend(args[param.name])
elif param.__class__ == MultiParameter:
sub_args = {}
......
Markdown is supported
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