Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
⚠
Problème réseau au niveau INRAE entre 10h15 et 10h35 aujourd'hui
⚠
Open sidebar
genotoul-bioinfo
jflow
Commits
dcc9b802
Commit
dcc9b802
authored
Oct 14, 2013
by
Jerome Mariette
Browse files
No commit message
No commit message
parent
efbdf4cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/jflow/parameter.py
View file @
dcc9b802
...
...
@@ -24,7 +24,7 @@ import copy as _copy
from
workflows.types
import
*
class
M
i
ltipleParameters
(
object
):
class
M
u
ltipleParameters
(
object
):
def
__init__
(
self
,
types
,
required
,
choices
,
excludes
,
default
,
actions
):
self
.
types
=
types
self
.
choices
=
choices
...
...
@@ -33,7 +33,7 @@ class MiltipleParameters(object):
self
.
actions
=
actions
self
.
index
=
None
self
.
required
=
required
self
.
__name__
=
"M
i
ltipleParameters"
self
.
__name__
=
"M
u
ltipleParameters"
def
__call__
(
self
,
arg
):
parts
=
arg
.
split
(
"="
)
...
...
@@ -214,7 +214,7 @@ class Parameter(object):
else
:
sub_param_excludes
[
sub_param
.
group
]
=
[
sub_param
.
flag
]
if
sub_param
.
required
:
sub_param_required
.
append
(
sub_param
.
flag
)
self
.
type
=
M
i
ltipleParameters
(
sub_param_hash
,
sub_param_required
,
sub_param_choices
,
sub_param_excludes
,
sub_param_default
,
sub_param_actions
)
self
.
type
=
M
u
ltipleParameters
(
sub_param_hash
,
sub_param_required
,
sub_param_choices
,
sub_param_excludes
,
sub_param_default
,
sub_param_actions
)
if
self
.
action
==
"append"
:
self
.
action
=
MiltipleAppendAction
else
:
...
...
src/jflow/workflow.py
View file @
dcc9b802
...
...
@@ -286,7 +286,7 @@ class Workflow(threading.Thread):
# if it's a boolean
elif
param
.
type
==
types
.
BooleanType
:
extended_args
[
param
.
name
]
=
args
[
param
.
name
]
in
[
True
,
1
,
'true'
,
'1'
,
't'
,
'y'
,
'yes'
]
elif
param
.
type
.
__name__
==
"M
i
ltipleParameters"
:
elif
param
.
type
.
__name__
==
"M
u
ltipleParameters"
:
extended_args
[
param
.
name
]
=
{}
for
sub_param
in
param
.
sub_parameters
:
# find the value
...
...
@@ -299,7 +299,7 @@ class Workflow(threading.Thread):
extended_args
[
param
.
name
]
=
args
[
param
.
name
]
# otherwise use the default
else
:
if
param
.
type
.
__name__
==
"M
i
ltipleParameters"
:
if
param
.
type
.
__name__
==
"M
u
ltipleParameters"
:
extended_args
[
param
.
name
]
=
{}
for
sub_param
in
param
.
sub_parameters
:
extended_args
[
param
.
name
][
sub_param
.
name
]
=
sub_param
.
default
...
...
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