aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorZachary Sloan2012-11-27 17:59:17 -0600
committerZachary Sloan2012-11-27 17:59:17 -0600
commit94dd9844fb55f4576d3a079e9d5e59ebbf911b8c (patch)
tree2d9d7c0b261b56e52032173727cef6043c951b9d /web
parent0931212bc692177cfc0ebcf016bc869dd4f88fd8 (diff)
downloadgenenetwork2-94dd9844fb55f4576d3a079e9d5e59ebbf911b8c.tar.gz
Created subclass for each main data set type and moved the code
for getting trait info that was in search_results.py into its respective class Renamed webqtlDataset to DataSet/create_dataset in webqtlTrait.py, webqtlDatabaseFunction.py, and CorrelationPage.py Got search page running again for mRNA assay data sets with these changes
Diffstat (limited to 'web')
-rwxr-xr-xweb/webqtl/search/SearchResultPage.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/web/webqtl/search/SearchResultPage.py b/web/webqtl/search/SearchResultPage.py
index 029a54c4..d62bb449 100755
--- a/web/webqtl/search/SearchResultPage.py
+++ b/web/webqtl/search/SearchResultPage.py
@@ -14,7 +14,7 @@ from htmlgen import HTMLgen2 as HT
from base import webqtlConfig
from utility.THCell import THCell
from utility.TDCell import TDCell
-from base.webqtlDataset import webqtlDataset
+from base.data_set import DataSet
from base.webqtlTrait import webqtlTrait
from base.templatePage import templatePage
from utility import webqtlUtil
@@ -65,12 +65,12 @@ class SearchResultPage(templatePage):
InbredSet where PublishFreeze.Name not like 'BXD300%' and InbredSet.Id =
PublishFreeze.InbredSetId""")
results = self.cursor.fetchall()
- self.database = map(lambda x: webqtlDataset(x[0], self.cursor), results)
+ self.database = map(lambda x: DataSet(x[0], self.cursor), results)
self.databaseCrosses = map(lambda x: x[1], results)
self.databaseCrossIds = map(lambda x: x[2], results)
self.singleCross = False
else:
- self.database = map(lambda x: webqtlDataset(x, self.cursor), self.database)
+ self.database = map(lambda x: DataSet(x, self.cursor), self.database)
#currently, webqtl wouldn't allow multiple crosses
#for other than multiple publish db search
#so we can use the first database as example