aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
diff options
context:
space:
mode:
authorzsloan2017-02-09 15:52:53 -0600
committerGitHub2017-02-09 15:52:53 -0600
commit048596e5ffb0323b0ebf3cc1a837b26b8774504e (patch)
treec2a31f6087fbd06185bf4ece9ddf30ebd602782b /wqflask/base
parentce55cd478b70b7a9692a24c2bc8fa47d84ea19a4 (diff)
parent434ce88d3b7bf29a65e738aa171a7bba6a887471 (diff)
downloadgenenetwork2-048596e5ffb0323b0ebf3cc1a837b26b8774504e.tar.gz
Merge pull request #246 from zsloan/master
Added genetic_type to DatasetGroup object to differentiate between wh…
Diffstat (limited to 'wqflask/base')
-rw-r--r--wqflask/base/data_set.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 02b5e07c..4b3ee4ca 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -264,7 +264,7 @@ class DatasetGroup(object):
def __init__(self, dataset):
"""This sets self.group and self.group_id"""
#logger.debug("DATASET NAME2:", dataset.name)
- self.name, self.id = fetchone(dataset.query_for_group)
+ self.name, self.id, self.genetic_type = fetchone(dataset.query_for_group)
if self.name == 'BXD300':
self.name = "BXD"
@@ -965,7 +965,7 @@ class MrnaAssayDataSet(DataSet):
self.query_for_group = '''
SELECT
- InbredSet.Name, InbredSet.Id
+ InbredSet.Name, InbredSet.Id, InbredSet.GeneticType
FROM
InbredSet, ProbeSetFreeze, ProbeFreeze
WHERE