aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
Diffstat (limited to 'wqflask')
-rwxr-xr-xwqflask/base/data_set.py2
-rw-r--r--wqflask/wqflask/parser.py2
-rw-r--r--wqflask/wqflask/search_results.py5
3 files changed, 6 insertions, 3 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 9e3e6d81..d9d3a52b 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -258,7 +258,7 @@ class GenotypeDataSet(DataSet):
# Todo: Obsolete or rename this field
self.type = 'Geno'
- query = '''
+ self.query = '''
SELECT
InbredSet.Name, InbredSet.Id
FROM
diff --git a/wqflask/wqflask/parser.py b/wqflask/wqflask/parser.py
index dc33fc52..7711942a 100644
--- a/wqflask/wqflask/parser.py
+++ b/wqflask/wqflask/parser.py
@@ -15,6 +15,8 @@ Both square brackets and parentheses can be used interchangeably. Both can also
encapsulate a single value; "cisLRS=[9 999 10)" would
be acceptable.]
+NEED TO DEAL WITH WILDCARD CHARACTER '*'
+
"""
from __future__ import print_function, division
diff --git a/wqflask/wqflask/search_results.py b/wqflask/wqflask/search_results.py
index b50e45d5..96350f22 100644
--- a/wqflask/wqflask/search_results.py
+++ b/wqflask/wqflask/search_results.py
@@ -55,6 +55,7 @@ class SearchResultPage(templatePage):
assert self.openMysql(), "Couldn't open MySQL"
print("fd is:", pf(fd))
+ print("fd.dict is:", pf(fd['dataset']))
self.dataset = fd['dataset']
# change back to self.dataset
@@ -93,7 +94,7 @@ class SearchResultPage(templatePage):
"""
Get the info displayed in the search result table from the set of results computed in
the "search" function
-
+
"""
self.trait_list = []
# result_set represents the results for each search term; a search of
@@ -114,7 +115,7 @@ class SearchResultPage(templatePage):
this_trait.retrieveInfo(QTL=True)
print("this_trait is:", pf(this_trait))
self.trait_list.append(this_trait)
-
+
self.dataset.get_trait_info(self.trait_list, species)