aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/data_set.py
diff options
context:
space:
mode:
authorZachary Sloan2014-07-18 17:31:41 +0000
committerZachary Sloan2014-07-18 17:31:41 +0000
commit8c45fcf1e9228108034fab96bc7e7eaa7740f06c (patch)
tree679680c80d2b3d9f24f16741b17a09c8823d8af6 /wqflask/base/data_set.py
parent8646d5fabd5e87f189f1429d71a872f8da80ba8c (diff)
downloadgenenetwork2-8c45fcf1e9228108034fab96bc7e7eaa7740f06c.tar.gz
Added outlier highlighting
Changed order of tabs in statistics panel on trait page Started working on heatmap
Diffstat (limited to 'wqflask/base/data_set.py')
-rwxr-xr-xwqflask/base/data_set.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 2a79dc9c..e6bd61c1 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -563,12 +563,15 @@ class DataSet(object):
""".format(*mescape(self.type, item, item, self.type, item, item))
if self.type == "Publish":
+ #query += """
+ # WHERE {}XRef.InbredSetId = '{}'
+ # """.format(*mescape(self.type, self.group.name))
+
query += """
- WHERE {}XRef.PublicationId = {}Freeze.Id
- and {}Freeze.Name = '{}'
+ WHERE {}XRef.InbredSetId = '{}'
and {}.Id = {}XRef.{}Id
order by {}.Id
- """.format(*mescape(self.type, self.type, self.type, self.name,
+ """.format(*mescape(self.type, self.group.name,
dataset_type, self.type, dataset_type, dataset_type))
else:
query += """
@@ -579,10 +582,10 @@ class DataSet(object):
""".format(*mescape(self.type, self.type, self.type, self.type,
self.name, dataset_type, self.type, self.type, dataset_type))
- #print("trait data query: ", query)
+ print("trait data query: ", query)
results = g.db.execute(query).fetchall()
- #print("query results:", results)
+ print("query results:", results)
trait_sample_data.append(results)
trait_count = len(trait_sample_data[0])