aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2016-12-13 19:58:23 +0000
committerzsloan2016-12-13 19:58:23 +0000
commit6a3f964240d9ff28238b2aaeb90d47f8fa244870 (patch)
tree4fe5d46e7eb59f80acbac2c7dab2d88b284c368c
parent3d710be17bedbd6f798cc783ac2f402465c79096 (diff)
downloadgenenetwork2-6a3f964240d9ff28238b2aaeb90d47f8fa244870.tar.gz
Fixed a problem related to the last commit that caused a problem when loading a collection or doing ctl analysis
-rw-r--r--wqflask/base/trait.py5
-rw-r--r--wqflask/wqflask/ctl/ctl_analysis.py2
2 files changed, 2 insertions, 5 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index ab0e6b82..eb5b91c3 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -268,10 +268,7 @@ def getSequence(trait, dataset_name):
return results[0]
-def retrieve_sample_data(trait, dataset_name, samplelist=None):
-
- dataset = create_dataset(dataset_name)
-
+def retrieve_sample_data(trait, dataset, samplelist=None):
if samplelist == None:
samplelist = []
diff --git a/wqflask/wqflask/ctl/ctl_analysis.py b/wqflask/wqflask/ctl/ctl_analysis.py
index c6b59ed7..1b1d7155 100644
--- a/wqflask/wqflask/ctl/ctl_analysis.py
+++ b/wqflask/wqflask/ctl/ctl_analysis.py
@@ -120,7 +120,7 @@ class CTL(object):
if trait != "":
ts = trait.split(':')
gt = TRAIT.GeneralTrait(name = ts[0], dataset_name = ts[1])
- gt = TRAIT.retrieve_sample_data(gt, dataset.name, individuals)
+ gt = TRAIT.retrieve_sample_data(gt, dataset, individuals)
for ind in individuals:
if ind in gt.data.keys():
traits.append(gt.data[ind].value)