Sync in wf

utilities.py

@@ -144,18 +144,32 @@ 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]))
 
+        # 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] == 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] != "":
+            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] = ""
+                sp_picture_dict[genus_species] = None
+
+        # 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] != 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)
 
     return sp_picture_dict