From 9b25ba56288d8a3b405392854836608ac3741985 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Fri, 24 Jun 2016 16:14:33 +0000
Subject: Removed function 'get_info' in trait.py that was never used and
 reomved 'get_trait_info' call from search_result_page.py because its query
 was already being run

---
 wqflask/base/trait.py             |  8 +-------
 wqflask/wqflask/collect.py        | 15 +++++++--------
 wqflask/wqflask/search_results.py |  3 ---
 3 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index b51b8c72..4bce25ac 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -79,13 +79,7 @@ class GeneralTrait(object):
                     dataset=self.dataset.name,
                     description=self.description_display,
                     mean=self.mean)
-
-
-    def get_info(self):
-        """For lots of traits just use get_trait_info in dataset instead...that will be way
-        more efficient"""
-        self.dataset.get_trait_info([self],
-            webqtlDatabaseFunction.retrieve_species(self.dataset.group.name))
+                    
 
     def get_name(self):
         stringy = ""
diff --git a/wqflask/wqflask/collect.py b/wqflask/wqflask/collect.py
index 958a1e43..4ea8407c 100644
--- a/wqflask/wqflask/collect.py
+++ b/wqflask/wqflask/collect.py
@@ -297,13 +297,13 @@ def view_collection():
     params = request.args
     print("PARAMS in view collection:", params)
 
-    if "uc_id" in params:
-        uc_id = params['uc_id']
-        uc = model.UserCollection.query.get(uc_id)
-        traits = json.loads(uc.members)
-        print("traits are:", traits)
-    else:
-        traits = AnonCollection().get_traits()
+    #if "uc_id" in params:
+    uc_id = params['uc_id']
+    uc = model.UserCollection.query.get(uc_id)
+    traits = json.loads(uc.members)
+    print("traits are:", traits)
+    #else:
+    #    traits = AnonCollection().get_traits()
 
     print("in view_collection traits are:", traits)
 
@@ -316,7 +316,6 @@ def view_collection():
 
         trait_ob = trait.GeneralTrait(name=name, dataset_name=dataset_name)
         trait_ob.retrieve_info(get_qtl_info=True)
-        trait_ob.get_info()
         trait_obs.append(trait_ob)
 
         json_version.append(trait_ob.jsonable())
diff --git a/wqflask/wqflask/search_results.py b/wqflask/wqflask/search_results.py
index 4c4e1ef2..a62f2d51 100644
--- a/wqflask/wqflask/search_results.py
+++ b/wqflask/wqflask/search_results.py
@@ -107,13 +107,10 @@ class SearchResultPage(object):
 
             #### Excel file needs to be generated ####
 
-            #print("foo locals are:", locals())
             trait_id = result[0]
             this_trait = GeneralTrait(dataset=self.dataset, name=trait_id, get_qtl_info=True, get_sample_info=False)
             self.trait_list.append(this_trait)
 
-        self.dataset.get_trait_info(self.trait_list, species)
-
     #def get_group_species_tree(self):
     #    self.species_groups = collections.default_dict(list)
     #    for key in self.results:
-- 
cgit v1.2.3