about summary refs log tree commit diff
diff options
context:
space:
mode:
authorzsloan2015-03-24 16:31:14 +0000
committerzsloan2015-03-24 16:31:14 +0000
commit3e7d1bdf8aa3c06d959e6461d6b776a2e5d4074f (patch)
treeb56996fcad5cb527ba38db45a46c0f9889efa359
parentbb1efb737da8f050c7d920ec4c4ab5c60503d590 (diff)
downloadgenenetwork2-3e7d1bdf8aa3c06d959e6461d6b776a2e5d4074f.tar.gz
Added pair scan to the marker_regression_page view
-rwxr-xr-xwqflask/wqflask/views.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index bac553d7..4b7bd639 100755
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -82,6 +82,14 @@ def index_page():
     #print("[orange] ds:", ds.datasets)
     return render_template("index_page.html")
 
+
+@app.route("/tmp")
+def tmp_page():
+    print("In tmp_page")
+    initial_start_vars = request.form
+    print("initial_start_vars:", initial_start_vars)
+
+
 @app.route("/data_sharing")
 def data_sharing_page():
     print("In data_sharing")
@@ -296,7 +304,7 @@ def marker_regression_page():
         if key in wanted or key.startswith(('value:')):
             start_vars[key] = value
 
-    version = "v3"
+    version = "v4"
     key = "marker_regression:{}:".format(version) + json.dumps(start_vars, sort_keys=True)
     print("key is:", pf(key))
     with Bench("Loading cache"):
@@ -335,7 +343,10 @@ def marker_regression_page():
         Redis.expire(key, 1*60)
 
     with Bench("Rendering template"):
-        rendered_template = render_template("marker_regression.html", **result)
+        if result['pair_scan'] == True:
+            rendered_template = render_template("pair_scan_results.html", **result)
+        else:
+            rendered_template = render_template("marker_regression.html", **result)
 
     return rendered_template