Skip to content
GitLab
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
78b4ec79
Commit
78b4ec79
authored
Oct 16, 2014
by
Frédéric Escudié
Browse files
No commit message
No commit message
parent
800c2bd6
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/jflow/workflow.py
View file @
78b4ec79
...
...
@@ -225,11 +225,11 @@ class Workflow(threading.Thread):
attribute_value
.
type
.
excludes
[
new_group
]
=
flags2exclude
break
def
_prepare_parameter
(
self
,
args
,
parameter
):
def
_prepare_parameter
(
self
,
args
,
parameter
,
key
=
"name"
):
new_param
=
None
# Retrieve value
if
args
.
has_key
(
parameter
.
flag
):
value
=
args
[
parameter
.
flag
]
if
args
.
has_key
(
parameter
.
__getattribute__
(
key
)
):
value
=
args
[
parameter
.
__getattribute__
(
key
)
]
elif
parameter
!=
None
:
value
=
parameter
.
default
else
:
...
...
@@ -268,7 +268,7 @@ class Workflow(threading.Thread):
for
sarg
in
args
[
param
.
name
]:
sub_args
[
sarg
[
0
]]
=
sarg
[
1
]
for
sub_param
in
param
.
sub_parameters
:
new_sub_parameter
=
self
.
_prepare_parameter
(
sub_args
,
sub_param
)
new_sub_parameter
=
self
.
_prepare_parameter
(
sub_args
,
sub_param
,
"flag"
)
new_param
[
new_sub_parameter
.
name
]
=
new_sub_parameter
elif
param
.
__class__
==
MultiParameterList
:
new_param
=
MultiParameterList
(
param
.
name
,
param
.
help
,
required
=
param
.
required
,
flag
=
param
.
flag
,
group
=
param
.
group
,
display_name
=
param
.
display_name
)
...
...
@@ -279,7 +279,7 @@ class Workflow(threading.Thread):
for
sarg
in
sargs
:
sub_args
[
sarg
[
0
]]
=
sarg
[
1
]
for
sub_param
in
param
.
sub_parameters
:
new_sub_param
=
self
.
_prepare_parameter
(
sub_args
,
sub_param
)
new_sub_param
=
self
.
_prepare_parameter
(
sub_args
,
sub_param
,
"flag"
)
new_multi_param
[
new_sub_param
.
name
]
=
new_sub_param
new_param
.
append
(
new_multi_param
)
else
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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