Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Maintenance - Mise à jour mensuelle Lundi 6 Février entre 7h00 et 9h00
Open sidebar
genotoul-bioinfo
ng6
Commits
1b38b183
Commit
1b38b183
authored
Jun 25, 2014
by
Penom Nom
Browse files
Correction of a bug when running addanalysis with quote in a string
parent
83580524
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/jflow/workflow.py
View file @
1b38b183
...
...
@@ -107,7 +107,7 @@ class Workflow(threading.Thread):
@
staticmethod
def
config_parser
(
arg_lines
):
for
arg
in
arg_lines
:
yield
arg
.
strip
(
"'"
).
strip
(
'"'
)
yield
arg
def
__setstate__
(
self
,
state
):
self
.
__dict__
=
state
.
copy
()
...
...
@@ -345,7 +345,7 @@ class Workflow(threading.Thread):
params
,
sub_order
,
excludes
,
hash_params
=
{},
{},
[],
{}
# first grab all parameters name
for
param
in
reader
.
items
(
parameters_section
):
cvalue
=
reader
.
get
(
parameters_section
,
param
[
0
])
.
strip
(
"'"
).
strip
(
'"'
)
cvalue
=
reader
.
get
(
parameters_section
,
param
[
0
])
cparam
=
param
[
0
].
split
(
"."
)[
0
]
ckey
=
"."
.
join
(
param
[
0
].
split
(
"."
)[
1
:])
if
len
(
ckey
.
split
(
"."
))
>
1
:
...
...
src/ng6/t3MySQLdb.py
View file @
1b38b183
...
...
@@ -473,9 +473,9 @@ class t3MySQLdb(object):
else
:
analysis_is_editable
=
0
req
=
"INSERT INTO tx_nG6_analyze (pid,tstamp,crdate,cruser_id,class,name,description,date,directory,software,version,"
req
+=
"hidden, params, is_editable, parent_uid) VALUES ('"
+
str
(
self
.
cfg_reader
.
get_pid
())
+
"','"
+
str
(
crdate
)
+
"','"
req
+=
str
(
crdate
)
+
"',"
+
str
(
cruser_id
)
+
",'"
+
aclass
+
"','"
+
name
.
replace
(
"'"
,
"
\'
"
)
+
"','"
+
description
.
replace
(
"'"
,
"
\'
"
)
+
"','"
req
+=
str
(
crdate
)
+
"','"
+
directory
+
"','"
+
software
.
replace
(
"'"
,
"
\'
"
)
+
"','"
req
+=
version
.
replace
(
"'"
,
"
\'
"
)
+
"','"
+
str
(
hidden
)
+
"','"
+
params
.
replace
(
"'"
,
"
\'
"
)
+
"','"
req
+=
str
(
crdate
)
+
"',"
+
str
(
cruser_id
)
+
",'"
+
aclass
+
"','"
+
name
.
replace
(
"'"
,
"
\
\
'"
)
+
"','"
+
description
.
replace
(
"'"
,
"
\
\
'"
)
+
"','"
req
+=
str
(
crdate
)
+
"','"
+
directory
+
"','"
+
software
.
replace
(
"'"
,
"
\
\
'"
)
+
"','"
req
+=
version
.
replace
(
"'"
,
"
\
\
'"
)
+
"','"
+
str
(
hidden
)
+
"','"
+
params
.
replace
(
"'"
,
"
\
\
'"
)
+
"','"
req
+=
str
(
analysis_is_editable
)
+
"','"
+
str
(
parent_uid
)
+
"')"
curs
.
execute
(
req
)
analysis_id
=
conn
.
insert_id
()
...
...
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