Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
genotoul-bioinfo
jflow
Commits
8f805fb0
Commit
8f805fb0
authored
Nov 24, 2014
by
Jerome Mariette
Browse files
fix a bug when linking workflow inputs
parent
f1974310
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/jflow/parameter.py
View file @
8f805fb0
...
@@ -387,11 +387,11 @@ class AbstractIOFile(LinkTraceback):
...
@@ -387,11 +387,11 @@ class AbstractIOFile(LinkTraceback):
class
IOFile
(
str
,
AbstractIOFile
):
class
IOFile
(
str
,
AbstractIOFile
):
def
__new__
(
self
,
val
=
""
,
file_format
=
"any"
,
component
_nameid
=
None
,
parent_
component
_nameid
=
None
):
def
__new__
(
self
,
val
=
""
,
file_format
=
"any"
,
linkTrace
_nameid
=
None
,
parent_
linkTrace
_nameid
=
None
):
return
str
.
__new__
(
self
,
val
)
return
str
.
__new__
(
self
,
val
)
def
__init__
(
self
,
val
=
""
,
file_format
=
"any"
,
component
_nameid
=
None
,
parent_
component
_nameid
=
None
):
def
__init__
(
self
,
val
=
""
,
file_format
=
"any"
,
linkTrace
_nameid
=
None
,
parent_
linkTrace
_nameid
=
None
):
AbstractIOFile
.
__init__
(
self
,
file_format
,
component
_nameid
,
parent_
component
_nameid
)
AbstractIOFile
.
__init__
(
self
,
file_format
,
linkTrace
_nameid
,
parent_
linkTrace
_nameid
)
class
MultiParameter
(
dict
,
AbstractParameter
):
class
MultiParameter
(
dict
,
AbstractParameter
):
...
...
src/jflow/workflow.py
View file @
8f805fb0
...
@@ -286,14 +286,19 @@ class Workflow(threading.Thread):
...
@@ -286,14 +286,19 @@ class Workflow(threading.Thread):
group
=
parameter
.
group
,
display_name
=
parameter
.
display_name
)
group
=
parameter
.
group
,
display_name
=
parameter
.
display_name
)
elif
parameter
.
__class__
==
InputFileList
:
elif
parameter
.
__class__
==
InputFileList
:
if
value
==
""
:
value
=
[]
# from GUI
if
value
==
""
:
value
=
[]
# from GUI
new_param
=
InputFileList
(
parameter
.
name
,
parameter
.
help
,
file_format
=
parameter
.
file_format
,
default
=
parameter
.
prepare_input_files
(
value
),
iovalues
=
[]
for
file
in
parameter
.
prepare_input_files
(
value
):
iovalues
.
append
(
IOFile
(
file
,
parameter
.
file_format
,
parameter
.
linkTrace_nameid
,
None
))
new_param
=
InputFileList
(
parameter
.
name
,
parameter
.
help
,
file_format
=
parameter
.
file_format
,
default
=
iovalues
,
type
=
parameter
.
type
,
choices
=
parameter
.
choices
,
required
=
parameter
.
required
,
flag
=
parameter
.
flag
,
type
=
parameter
.
type
,
choices
=
parameter
.
choices
,
required
=
parameter
.
required
,
flag
=
parameter
.
flag
,
group
=
parameter
.
group
,
display_name
=
parameter
.
display_name
,
size_limit
=
parameter
.
size_limit
)
group
=
parameter
.
group
,
display_name
=
parameter
.
display_name
,
size_limit
=
parameter
.
size_limit
)
new_param
.
linkTrace_nameid
=
parameter
.
linkTrace_nameid
elif
parameter
.
__class__
==
InputFile
:
elif
parameter
.
__class__
==
InputFile
:
if
value
==
""
:
value
=
None
# from GUI
if
value
==
""
:
value
=
None
# from GUI
new_param
=
InputFile
(
parameter
.
name
,
parameter
.
help
,
file_format
=
parameter
.
file_format
,
default
=
parameter
.
prepare_input_file
(
value
),
new_param
=
InputFile
(
parameter
.
name
,
parameter
.
help
,
file_format
=
parameter
.
file_format
,
default
=
parameter
.
prepare_input_file
(
value
),
type
=
parameter
.
type
,
choices
=
parameter
.
choices
,
required
=
parameter
.
required
,
flag
=
parameter
.
flag
,
type
=
parameter
.
type
,
choices
=
parameter
.
choices
,
required
=
parameter
.
required
,
flag
=
parameter
.
flag
,
group
=
parameter
.
group
,
display_name
=
parameter
.
display_name
)
group
=
parameter
.
group
,
display_name
=
parameter
.
display_name
)
new_param
.
linkTrace_nameid
=
parameter
.
linkTrace_nameid
else
:
else
:
raise
Exception
(
"Unknown class '"
+
parameter
.
__class__
.
__name__
+
"' for parameter."
)
raise
Exception
(
"Unknown class '"
+
parameter
.
__class__
.
__name__
+
"' for parameter."
)
return
new_param
return
new_param
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment