aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/data_set.py
diff options
context:
space:
mode:
authorPjotr Prins2016-06-26 09:54:28 +0000
committerPjotr Prins2016-06-26 09:54:28 +0000
commite5db09b6da841eb077335a50c2dba1326d8dd670 (patch)
treef2c2c359d4ca09a8fb45e77211837dd066cec00f /wqflask/base/data_set.py
parentd1192b1f244e8976fb53c260179eb3715029ebf4 (diff)
downloadgenenetwork2-e5db09b6da841eb077335a50c2dba1326d8dd670.tar.gz
gn_server: simplify
Diffstat (limited to 'wqflask/base/data_set.py')
-rw-r--r--wqflask/base/data_set.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index ec3750dd..e0bf5f40 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -488,18 +488,14 @@ class DataSet(object):
self.name,
self.name))
- # self.id, self.name, self.fullname, self.shortname, self.data_scale, self.tissue =
- result = fetch1("""
+ self.id, self.name, self.fullname, self.shortname, self.data_scale, self.tissue = fetch1("""
SELECT ProbeSetFreeze.Id, ProbeSetFreeze.Name, ProbeSetFreeze.FullName, ProbeSetFreeze.ShortName, ProbeSetFreeze.DataScale, Tissue.Name
FROM ProbeSetFreeze, ProbeFreeze, Tissue
WHERE ProbeSetFreeze.public > %s
AND ProbeSetFreeze.ProbeFreezeId = ProbeFreeze.Id
AND ProbeFreeze.TissueId = Tissue.Id
AND (ProbeSetFreeze.Name = '%s' OR ProbeSetFreeze.FullName = '%s' OR ProbeSetFreeze.ShortName = '%s')
- """ % (query_args),
- "/dataset/"+self.name+".json",helper)
- self.id, self.name, self.fullname, self.shortname, self.data_scale, self.tissue = result
- logger.debug("retrieve_other_names result:",result)
+ """ % (query_args),"/dataset/"+self.name+".json",helper)
else:
query_args = tuple(escape(x) for x in (
(self.type + "Freeze"),