diff options
Diffstat (limited to 'wqflask/base')
| -rw-r--r-- | wqflask/base/data_set.py | 4 | ||||
| -rw-r--r-- | wqflask/base/trait.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 6c6deea9..67515111 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -1181,9 +1181,9 @@ ProbeFreeze.Id = ProbeSetFreeze.ProbeFreezeId AND ProbeSetFreeze.Name = %s""" "ProbeSetXRef.DataId = ProbeSetData.Id " "AND ProbeSetData.StrainId = Strain.Id " "ORDER BY Strain.Name", - (trait, self.name) + (trait, self.name,) ) - return cursor.fetchall() + return cursor.fetchall() def retrieve_genes(self, column_name): with database_connection() as conn, conn.cursor() as cursor: diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index ad8706ef..d8a2ec08 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -1,7 +1,7 @@ import requests import simplejson as json from wqflask import app - +from utility import hmac from base import webqtlConfig from base.webqtlCaseData import webqtlCaseData from base.data_set import create_dataset @@ -229,7 +229,6 @@ def retrieve_sample_data(trait, dataset, samplelist=None): results = Redis.get(trait.name).split() else: results = dataset.retrieve_sample_data(trait.name) - # Todo: is this necessary? If not remove trait.data.clear() |