aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/data_set.py
diff options
context:
space:
mode:
authorGN22020-04-24 16:09:10 -0500
committerGN22020-04-24 16:09:10 -0500
commit789252703c00bcbdd98dd5088d0e4651e750a24a (patch)
treef3ed2c01e2ecffc56c924e26f45f0128f26e200b /wqflask/base/data_set.py
parentc5c9f0e793ca729aa14dc38b7e8de1cb713ed730 (diff)
parentd56ae51d72335c10e5f08c22a4e0cba1ab3547cb (diff)
downloadgenenetwork2-789252703c00bcbdd98dd5088d0e4651e750a24a.tar.gz
Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into HEAD
Diffstat (limited to 'wqflask/base/data_set.py')
-rw-r--r--wqflask/base/data_set.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index fae62875..8652e6b7 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -56,7 +56,7 @@ from pprint import pformat as pf
from db.gn_server import menu_main
from db.call import fetchall,fetchone,fetch1
-from utility.tools import USE_GN_SERVER, USE_REDIS, flat_files, flat_file_exists
+from utility.tools import USE_GN_SERVER, USE_REDIS, flat_files, flat_file_exists, GN2_BASE_URL
from utility.logger import getLogger
logger = getLogger(__name__ )
@@ -94,7 +94,7 @@ Publish or ProbeSet. E.g.
"""
self.datasets = {}
if rebuild: #ZS: May make this the only option
- data = json.loads(requests.get("http://gn2.genenetwork.org/api/v_pre1/gen_dropdown").content)
+ data = json.loads(requests.get(GN2_BASE_URL + "/api/v_pre1/gen_dropdown").content)
#data = gen_menu.gen_dropdown_json()
else:
file_name = "wqflask/static/new/javascript/dataset_menu_structure.json"