Skip to content
Snippets Groups Projects
Commit 6f84795c authored by Loraine Guéguen's avatar Loraine Guéguen Committed by Loraine Gueguen
Browse files

fix get picture

parent f57dde52
No related branches found
No related tags found
1 merge request!28WIP: Fix empty strain sex
......@@ -145,11 +145,10 @@ def get_sp_picture(sp_dict_list):
genus_species = get_gspecies_string_from_sp_dict(sp)
# no picture stored yet for this genus_species
if genus_species not in sp_picture_dict.keys() \
or (genus_species not in sp_picture_dict.keys()
and sp_picture_dict[genus_species] != "") \
or (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 ) :
or (genus_species in sp_picture_dict.keys()
and sp_picture_dict[genus_species] == ""):
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] != "":
......@@ -157,6 +156,14 @@ def get_sp_picture(sp_dict_list):
else:
sp_picture_dict[genus_species] = ""
# overwrite stored picture if a picture exists for the main strain
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] != ""):
sp_picture_dict[genus_species] = sp[constants.ORG_PARAM_DESC][constants.ORG_PARAM_DESC_PICTURE_PATH]
return sp_picture_dict
def get_sp_jbrowse_links(org_list):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment