diff options
author | Sam Ockman | 2012-06-01 02:03:02 -0400 |
---|---|---|
committer | Sam Ockman | 2012-06-01 02:03:02 -0400 |
commit | 63297d5f4eb61541cb98dcbca668410f6550257a (patch) | |
tree | 92e75cedd15ac33dc8e2e193c7467c7af12f62c3 /wqflask | |
parent | f20f85afaba408e04852e04cd75faa45662d1724 (diff) | |
download | genenetwork2-63297d5f4eb61541cb98dcbca668410f6550257a.tar.gz |
Views and templates modified to allow template analysis
Diffstat (limited to 'wqflask')
-rw-r--r-- | wqflask/runserver.py | 6 | ||||
-rw-r--r-- | wqflask/wqflask/search_results.py | 6 | ||||
-rw-r--r-- | wqflask/wqflask/templates/search_result_page.html | 5 | ||||
-rw-r--r-- | wqflask/wqflask/views.py | 4 |
4 files changed, 17 insertions, 4 deletions
diff --git a/wqflask/runserver.py b/wqflask/runserver.py index bf73ed37..7bd82619 100644 --- a/wqflask/runserver.py +++ b/wqflask/runserver.py @@ -11,5 +11,11 @@ from wqflask import app # # For more info see: http://www.cyberciti.biz/faq/iptables-block-port/ +import logging +logging.basicConfig(filename="/tmp/flask_gn_log", level=logging.INFO) + +_log = logging.getLogger("search") +_ch = logging.StreamHandler() +_log.addHandler(_ch) app.run(host='0.0.0.0') diff --git a/wqflask/wqflask/search_results.py b/wqflask/wqflask/search_results.py index ee67c5de..ce7a6eef 100644 --- a/wqflask/wqflask/search_results.py +++ b/wqflask/wqflask/search_results.py @@ -5,9 +5,9 @@ from wqflask import app from flask import render_template ################################################### -# +# # # This file uses only spaces for indentation # -# +# # ################################################### import string @@ -36,7 +36,7 @@ from utility import webqtlUtil from dbFunction import webqtlDatabaseFunction import logging -logging.basicConfig(filename="/tmp/gn_log", level=logging.INFO) +logging.basicConfig(filename="/tmp/flask_gn_log", level=logging.INFO) _log = logging.getLogger("search") _ch = logging.StreamHandler() diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html index f79a19a7..b00355a6 100644 --- a/wqflask/wqflask/templates/search_result_page.html +++ b/wqflask/wqflask/templates/search_result_page.html @@ -172,7 +172,10 @@ <INPUT TYPE="checkbox" NAME="searchResult" class="checkbox" VALUE="{{ thisTrait }}" onClick="highlight(this)"> </TD> <TD class="fs12 fwn b1 c222"> - <A HREF="javascript:showDatabase3('{{ thisFormName }}','{{thisTrait.db.name}}','{{ thisTrait.name }}','{{ thisTrait.cellid }}')" class="fs12 fwn">{{ thisTrait.name.upper() }}</A> + <A HREF="javascript:showDatabase3('{{ thisFormName }}','{{thisTrait.db.name}}','{{ thisTrait.name }}','{{ thisTrait.cellid }}')" class="fs12 fwn"> - </a> + <a href="{{ url_for('showDatabaseBXD', database=thisTrait.db.name, ProbeSetID=thisTrait.name, incparentsf1='ON', RISet='BXD')}}" class="fs12 fwn"> + {{ thisTrait.name.upper() }} + </a> </TD> <TD class="fs12 fwn b1 c222 fsI"> <A HREF="http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?db=gene&cmd=Retrieve&dopt=Graphics&list_uids={{thisTrait.geneid}}" TARGET="_blank" class="font_black fs12 fwn"> diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index 88a6f6a1..b128f425 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -17,3 +17,7 @@ def index_page(): def search(): the_search = search_results.SearchResultPage(request.args) return render_template("search_result_page.html", **the_search.__dict__) + +@app.route("/showDatabaseBXD") +def showDatabaseBXD(): + return None |