diff options
| -rwxr-xr-x | wqflask/wqflask/do_search.py | 11 | ||||
| -rw-r--r-- | wqflask/wqflask/static/new/javascript/scatter-matrix.js | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/wqflask/wqflask/do_search.py b/wqflask/wqflask/do_search.py index 31dc11b5..921a4a47 100755 --- a/wqflask/wqflask/do_search.py +++ b/wqflask/wqflask/do_search.py @@ -382,11 +382,20 @@ class RifSearch(MrnaAssaySearch): DoSearch.search_types['RIF'] = "RifSearch" - def run(self): + def get_where_clause(self): where_clause = """( %s.symbol = GeneRIF_BASIC.symbol and MATCH (GeneRIF_BASIC.comment) AGAINST ('+%s' IN BOOLEAN MODE)) """ % (self.dataset.type, self.search_term[0]) + return where_clause + + def run(self): + #where_clause = """( %s.symbol = GeneRIF_BASIC.symbol and + # MATCH (GeneRIF_BASIC.comment) + # AGAINST ('+%s' IN BOOLEAN MODE)) """ % (self.dataset.type, self.search_term[0]) + + where_clause = self.get_where_clause() + from_clause = ", GeneRIF_BASIC " query = self.compile_final_query(from_clause, where_clause) diff --git a/wqflask/wqflask/static/new/javascript/scatter-matrix.js b/wqflask/wqflask/static/new/javascript/scatter-matrix.js index 38cdc75b..15385b00 100644 --- a/wqflask/wqflask/static/new/javascript/scatter-matrix.js +++ b/wqflask/wqflask/static/new/javascript/scatter-matrix.js @@ -57,7 +57,7 @@ ScatterMatrix.prototype.render = function () { .attr('class', 'scatter-matrix-container'); var control = container.append('div') .attr('class', 'scatter-matrix-control') - .style({'float':'left'}) + .style({'float':'left', 'margin-right':'50px'}) var svg = container.append('div') .attr('class', 'scatter-matrix-svg') .style({'float':'right'}) |