aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/data_set.py
diff options
context:
space:
mode:
authorZachary Sloan2013-11-25 23:17:34 +0000
committerZachary Sloan2013-11-25 23:17:34 +0000
commit29a8396d1def9a883483a1b98e1815c6a0101147 (patch)
tree2baae6fb3b3640d49ef76bad40dff1e39380c39f /wqflask/base/data_set.py
parent8d1187e8aa1ff1ec151aa95742c2c660d74447e8 (diff)
parente7142c0785a9680b56d789f1db0a738d6172de55 (diff)
downloadgenenetwork2-29a8396d1def9a883483a1b98e1815c6a0101147.tar.gz
Merge branch 'temp'
Diffstat (limited to 'wqflask/base/data_set.py')
-rwxr-xr-xwqflask/base/data_set.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index cd8c1ac1..8296adea 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -318,12 +318,17 @@ class DatasetGroup(object):
#determine default genotype object
if self.incparentsf1 and genotype_1.type != "intercross":
- self.genotype = genotype_2
+ #self.genotype = genotype_2
+ genotype = genotype_2
else:
self.incparentsf1 = 0
- self.genotype = genotype_1
+ #self.genotype = genotype_1
+ genotype = genotype_1
- self.samplelist = list(self.genotype.prgy)
+ #self.samplelist = list(self.genotype.prgy)
+ self.samplelist = list(genotype.prgy)
+
+ return genotype
#class DataSets(object):
@@ -1084,6 +1089,7 @@ class MrnaAssayDataSet(DataSet):
Strain.Name
""" % (escape(trait), escape(self.name))
results = g.db.execute(query).fetchall()
+ print("RETRIEVED RESULTS HERE:", results)
return results