diff options
Diffstat (limited to 'wqflask/base/data_set')
| -rw-r--r-- | wqflask/base/data_set/__init__.py | 2 | ||||
| -rw-r--r-- | wqflask/base/data_set/datasetgroup.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/wqflask/base/data_set/__init__.py b/wqflask/base/data_set/__init__.py index ad51e47e..c2c0aef1 100644 --- a/wqflask/base/data_set/__init__.py +++ b/wqflask/base/data_set/__init__.py @@ -115,7 +115,7 @@ def datasets(group_name, this_group=None, redis_conn=Redis()): dataset_menu.append(dict(tissue=tissue_name, datasets=[(dataset, dataset_short)])) - if get_setting_bool("USE_REDIS"): + if get_setting_bool(app, "USE_REDIS"): redis_conn.set(key, pickle.dumps(dataset_menu, pickle.HIGHEST_PROTOCOL)) redis_conn.expire(key, 60 * 5) diff --git a/wqflask/base/data_set/datasetgroup.py b/wqflask/base/data_set/datasetgroup.py index 90c59a1e..a44cf18d 100644 --- a/wqflask/base/data_set/datasetgroup.py +++ b/wqflask/base/data_set/datasetgroup.py @@ -15,6 +15,7 @@ from wqflask.database import database_connection from utility.configuration import ( locate, flat_files, + get_setting, flat_file_exists, get_setting_bool, locate_ignore_error) @@ -128,7 +129,7 @@ class DatasetGroup: return study_samples def get_genofiles(self): - jsonfile = "%s/%s.json" % (webqtlConfig.GENODIR, self.name) + jsonfile = "%s/%s.json" % (get_setting(app, "WEBQTL_GENODIR"), self.name) try: f = open(jsonfile) except: |