Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OBITools3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
23
Issues
23
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
OBITools
OBITools3
Commits
c437931a
Commit
c437931a
authored
Dec 10, 2018
by
Celine Mercier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cython: fixed history dot graph for all views, and fixed history
recording for build_ref_db and ecotag
parent
eb586b2f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
3 deletions
+14
-3
python/obitools3/commands/build_ref_db.pyx
python/obitools3/commands/build_ref_db.pyx
+6
-1
python/obitools3/commands/ecotag.pyx
python/obitools3/commands/ecotag.pyx
+7
-1
python/obitools3/dms/view/view.pyx
python/obitools3/dms/view/view.pyx
+1
-1
No files found.
python/obitools3/commands/build_ref_db.pyx
View file @
c437931a
...
...
@@ -75,7 +75,11 @@ def run(config):
# Save command config in View comments
command_line
=
" "
.
join
(
sys
.
argv
[
1
:])
comments
=
View
.
print_config
(
config
,
"build_ref_db"
,
command_line
,
input_dms_name
=
[
i_dms_name
],
input_view_name
=
[
i_view_name
])
input_dms_name
=
[
i_dms_name
]
input_view_name
=
[
i_view_name
]
input_dms_name
.
append
(
config
[
'obi'
][
'taxoURI'
].
split
(
"/"
)[
-
3
])
input_view_name
.
append
(
"taxonomy/"
+
config
[
'obi'
][
'taxoURI'
].
split
(
"/"
)[
-
1
])
comments
=
View
.
print_config
(
config
,
"build_ref_db"
,
command_line
,
input_dms_name
=
input_dms_name
,
input_view_name
=
input_view_name
)
if
build_reference_db
(
tobytes
(
i_dms_name
),
tobytes
(
i_view_name
),
tobytes
(
taxonomy_name
),
tobytes
(
o_view_name
),
comments
,
config
[
'build_ref_db'
][
'threshold'
])
<
0
:
raise
Exception
(
"Error building a reference database"
)
...
...
@@ -96,3 +100,4 @@ def run(config):
o_dms
.
close
()
i_dms
.
close
()
python/obitools3/commands/ecotag.pyx
View file @
c437931a
...
...
@@ -93,7 +93,13 @@ def run(config):
# Save command config in View comments
command_line
=
" "
.
join
(
sys
.
argv
[
1
:])
comments
=
View
.
print_config
(
config
,
"ecotag"
,
command_line
,
input_dms_name
=
[
i_dms_name
],
input_view_name
=
[
i_view_name
])
# TODO no. fix
input_dms_name
=
[
i_dms_name
]
input_view_name
=
[
i_view_name
]
input_dms_name
.
append
(
ref_dms_name
)
input_view_name
.
append
(
ref_view_name
)
input_dms_name
.
append
(
config
[
'obi'
][
'taxoURI'
].
split
(
"/"
)[
-
3
])
input_view_name
.
append
(
"taxonomy/"
+
config
[
'obi'
][
'taxoURI'
].
split
(
"/"
)[
-
1
])
comments
=
View
.
print_config
(
config
,
"ecotag"
,
command_line
,
input_dms_name
=
input_dms_name
,
input_view_name
=
input_view_name
)
if
obi_ecotag
(
tobytes
(
i_dms_name
),
tobytes
(
i_view_name
),
\
tobytes
(
ref_dms_name
),
tobytes
(
ref_view_name
),
\
...
...
python/obitools3/dms/view/view.pyx
View file @
c437931a
...
...
@@ -485,7 +485,7 @@ cdef class View(OBIWrapper) :
@
property
def
dot_history_graph
(
self
):
uniq_graph
=
[]
for
elt
in
self
.
history_graph_list
:
for
elt
in
self
.
dot_
history_graph_list
:
if
elt
not
in
uniq_graph
:
uniq_graph
.
append
(
elt
)
uniq_graph
.
insert
(
0
,
b
"digraph
\"
"
+
self
.
name
+
b
"
\"
{
\n
"
)
...
...
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