Skip to content
Snippets Groups Projects

Sync in wf

Merged Sync in wf
sync_in_wf into dev
Merged Loraine Gueguen requested to merge sync_in_wf into dev
Viewing commit 5925f2af
Prev Next
Show latest version
1 file
+ 9
− 7
Compare changes
  • Side-by-side
  • Inline
utilities.py
+ 9
− 7
@@ -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