diff options
Diffstat (limited to 'wqflask/wqflask/do_search.py')
| -rwxr-xr-x | wqflask/wqflask/do_search.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/wqflask/wqflask/do_search.py b/wqflask/wqflask/do_search.py index ee85efb2..a42503c1 100755 --- a/wqflask/wqflask/do_search.py +++ b/wqflask/wqflask/do_search.py @@ -448,6 +448,9 @@ class RifSearch(MrnaAssaySearch): DoSearch.search_types['ProbeSet_RIF'] = "RifSearch" + def get_from_clause(self): + return ", GeneRIF_BASIC " + def get_where_clause(self): where_clause = """( %s.symbol = GeneRIF_BASIC.symbol and MATCH (GeneRIF_BASIC.comment) @@ -456,9 +459,9 @@ class RifSearch(MrnaAssaySearch): return where_clause def run(self): + from_clause = self.get_from_clause() where_clause = self.get_where_clause() - from_clause = ", GeneRIF_BASIC " query = self.compile_final_query(from_clause, where_clause) return self.execute(query) @@ -468,6 +471,9 @@ class WikiSearch(MrnaAssaySearch): DoSearch.search_types['ProbeSet_WIKI'] = "WikiSearch" + def get_from_clause(self): + return ", GeneRIF " + def get_where_clause(self): where_clause = """%s.symbol = GeneRIF.symbol and GeneRIF.versionId=0 and GeneRIF.display>0 @@ -478,9 +484,9 @@ class WikiSearch(MrnaAssaySearch): return where_clause def run(self): + from_clause = self.get_from_clause() where_clause = self.get_where_clause() - from_clause = ", GeneRIF " query = self.compile_final_query(from_clause, where_clause) return self.execute(query) |