aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/data_set.py
diff options
context:
space:
mode:
authorPjotr Prins2016-04-29 08:18:39 +0000
committerPjotr Prins2016-04-29 08:18:39 +0000
commit1d50581402b368dd55f29135cca643b357b5a65b (patch)
tree7736db1d4fb14ee9ad97de95a71932a96738e3cb /wqflask/base/data_set.py
parent6e23be8f278e98386171f4702414224545decfe0 (diff)
parent6e6482db14c3840328d786c551feea6e34a3ef06 (diff)
downloadgenenetwork2-1d50581402b368dd55f29135cca643b357b5a65b.tar.gz
Merge
Diffstat (limited to 'wqflask/base/data_set.py')
-rw-r--r--[-rwxr-xr-x]wqflask/base/data_set.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 52ac95f0..053b45fc 100755..100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -417,6 +417,7 @@ class DataSet(object):
self.shortname = None
self.fullname = None
self.type = None
+ self.data_scale = None #ZS: For example log2
self.setup()
@@ -456,8 +457,8 @@ class DataSet(object):
self.name,
self.name))
- self.id, self.name, self.fullname, self.shortname, self.tissue = g.db.execute("""
- SELECT ProbeSetFreeze.Id, ProbeSetFreeze.Name, ProbeSetFreeze.FullName, ProbeSetFreeze.ShortName, Tissue.Name
+ self.id, self.name, self.fullname, self.shortname, self.data_scale, self.tissue = g.db.execute("""
+ 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