From 6d2a5d91c83413f470fec1f76f197c7f7a2ed654 Mon Sep 17 00:00:00 2001 From: christian Date: Mon, 15 Aug 2016 15:54:02 +0200 Subject: Fix genotype source, interval mapping issue --- wqflask/wqflask/templates/marker_regression_gn1.html | 6 ++---- wqflask/wqflask/views.py | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'wqflask') diff --git a/wqflask/wqflask/templates/marker_regression_gn1.html b/wqflask/wqflask/templates/marker_regression_gn1.html index b9d1f4fe..1e570581 100644 --- a/wqflask/wqflask/templates/marker_regression_gn1.html +++ b/wqflask/wqflask/templates/marker_regression_gn1.html @@ -370,10 +370,8 @@ provides_entrypoints: true }); BD.putSource({name: 'Genotype', - /* controlURI: "http://test-gn2.genenetwork.org/api_pre1/genotype/mouse/BXD.json",*/ - /* URIBase: "http://test-gn2.genenetwork.org/api_pre1/genotype/mouse/",*/ - controlURI: "http://localhost:8880/genotype/mouse/BXD.json", - URIBase: "http://localhost:8880/", + controlURI: "http://test-gn2.genenetwork.org/api_pre1/genotype/mouse/BXD.json", + URIBase: "http://test-gn2.genenetwork.org/api_pre1/genotype/mouse/", tier_type: 'rqtl-genotype', pinned: true, transposed: true, diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index 0a2fa83a..1f967dc9 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -481,7 +481,8 @@ def marker_regression_page(): writer = csv.writer(csv_file) writer.writerow(("Locus", "Chr", "Mb", "LOD")) for (row) in qtl_results: - writer.writerow((row["name"], row["chr"], row["Mb"], row["lod_score"])) + score = row["lod_score"] if "lod_score" in row else row["lrs_value"] + writer.writerow((row["name"], row["chr"], row["Mb"], score)) result = template_vars.__dict__ -- cgit v1.2.3