Merge branch 'master' of github.com:genenetwork/genenetwork2

1 files changed, 10 insertions, 6 deletions

diff --git a/wqflask/utility/helper_functions.py b/wqflask/utility/helper_functions.py
index 15f60765..149ee553 100644
--- a/wqflask/utility/helper_functions.py
+++ b/wqflask/utility/helper_functions.py
@@ -4,6 +4,8 @@ from base.trait import GeneralTrait
 from base import data_set
 from base.species import TheSpecies
 
+from wqflask import user_manager
+
 
 def get_species_dataset_trait(self, start_vars):
     #assert type(read_genotype) == type(bool()), "Expecting boolean value for read_genotype"
@@ -23,13 +25,15 @@ def get_species_dataset_trait(self, start_vars):
 
 
 def get_trait_db_obs(self, trait_db_list):
-
+    if isinstance(trait_db_list, basestring):
+        trait_db_list = trait_db_list.split(",")
+        
     self.trait_list = []
-    for i, trait_db in enumerate(trait_db_list):
-        if i == (len(trait_db_list) - 1):
-            break
-        trait_name, dataset_name = trait_db.split(":")
-        #print("dataset_name:", dataset_name)
+    for trait in trait_db_list:
+        data, _separator, hmac = trait.rpartition(':')
+        data = data.strip()
+        assert hmac==user_manager.actual_hmac_creation(data), "Data tampering?"
+        trait_name, dataset_name = data.split(":")
         dataset_ob = data_set.create_dataset(dataset_name)
         trait_ob = GeneralTrait(dataset=dataset_ob,
                                name=trait_name,