Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gga_load_data
Manage
Activity
Members
Labels
Plan
Issues
12
Issue boards
Milestones
Wiki
Code
Merge requests
5
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
abims
e-infra
gga_load_data
Merge requests
!25
Sync in wf
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Sync in wf
sync_in_wf
into
dev
Overview
0
Commits
11
Pipelines
0
Changes
8
Merged
Loraine Gueguen
requested to merge
sync_in_wf
into
dev
3 years ago
Overview
0
Commits
11
Pipelines
0
Changes
1
Expand
👍
0
👎
0
Merge request reports
Compare
version 6
version 7
5925f2af
3 years ago
version 6
dac92cd6
3 years ago
version 5
64eb7c03
3 years ago
version 4
70969c5c
3 years ago
version 3
f24c3645
3 years ago
version 2
286fed10
3 years ago
version 1
b03e6a16
3 years ago
dev (base)
and
version 7
latest version
6baf190f
11 commits,
3 years ago
version 7
5925f2af
10 commits,
3 years ago
version 6
dac92cd6
9 commits,
3 years ago
version 5
64eb7c03
8 commits,
3 years ago
version 4
70969c5c
7 commits,
3 years ago
version 3
f24c3645
6 commits,
3 years ago
version 2
286fed10
5 commits,
3 years ago
version 1
b03e6a16
4 commits,
3 years ago
Show latest version
1 file
+
9
−
7
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
utilities.py
+
9
−
7
Options
@@ -144,17 +144,18 @@ def get_sp_picture(sp_dict_list):
for
sp
in
sp_dict_list
:
genus_species
=
get_gspecies_string_from_sp_dict
(
sp
)
logging
.
debug
(
"
picture path for {0} {1}: {2}
"
.
format
(
genus_species
,
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_STRAIN
],
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]))
#
logging.debug("picture path for {0} {1}: {2}".format(genus_species,
#
sp[constants.ORG_PARAM_DESC][constants.ORG_PARAM_DESC_STRAIN],
#
sp[constants.ORG_PARAM_DESC][constants.ORG_PARAM_DESC_PICTURE_PATH]))
# no picture stored yet for this genus_species
if
genus_species
not
in
sp_picture_dict
.
keys
()
\
or
(
genus_species
in
sp_picture_dict
.
keys
()
and
sp_picture_dict
[
genus_species
]
==
None
):
if
constants
.
ORG_PARAM_DESC_PICTURE_PATH
in
sp
[
constants
.
ORG_PARAM_DESC
].
keys
()
and
\
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]
!=
None
:
if
constants
.
ORG_PARAM_DESC_PICTURE_PATH
in
sp
[
constants
.
ORG_PARAM_DESC
].
keys
()
\
and
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]
!=
None
\
and
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]
!=
""
:
sp_picture_dict
[
genus_species
]
=
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]
else
:
sp_picture_dict
[
genus_species
]
=
None
@@ -163,11 +164,12 @@ def get_sp_picture(sp_dict_list):
if
(
constants
.
ORG_PARAM_DESC_MAIN_SPECIES
in
sp
[
constants
.
ORG_PARAM_DESC
].
keys
()
and
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_MAIN_SPECIES
]
==
True
)
\
and
(
constants
.
ORG_PARAM_DESC_PICTURE_PATH
in
sp
[
constants
.
ORG_PARAM_DESC
].
keys
()
and
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]
!=
None
):
and
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]
!=
None
and
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]
!=
""
):
sp_picture_dict
[
genus_species
]
=
sp
[
constants
.
ORG_PARAM_DESC
][
constants
.
ORG_PARAM_DESC_PICTURE_PATH
]
logging
.
debug
(
"
picture dict: %s
"
%
sp_picture_dict
)
#
logging.debug("picture dict: %s" % sp_picture_dict)
return
sp_picture_dict
Loading