diff options
author | zsloan | 2020-04-26 10:57:09 -0500 |
---|---|---|
committer | zsloan | 2020-04-26 10:57:09 -0500 |
commit | f0139ef93c7e8329c1a84fe9f75273c36626df0e (patch) | |
tree | 4ee1c5dabc3bb13456d66c62ba5f31ae44faafd4 | |
parent | d56ae51d72335c10e5f08c22a4e0cba1ab3547cb (diff) | |
download | genenetwork2-f0139ef93c7e8329c1a84fe9f75273c36626df0e.tar.gz |
Removed the code that was still writing the database menu JSON
-rw-r--r-- | wqflask/base/data_set.py | 14 | ||||
-rw-r--r-- | wqflask/wqflask/api/gen_menu.py | 5 |
2 files changed, 5 insertions, 14 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py index 8652e6b7..1f99df49 100644 --- a/wqflask/base/data_set.py +++ b/wqflask/base/data_set.py @@ -64,7 +64,7 @@ logger = getLogger(__name__ ) # Each subclass will add to this DS_NAME_MAP = {} -def create_dataset(dataset_name, rebuild=True, dataset_type = None, get_samplelist = True, group_name = None): +def create_dataset(dataset_name, dataset_type = None, get_samplelist = True, group_name = None): if not dataset_type: dataset_type = Dataset_Getter(dataset_name) @@ -77,7 +77,7 @@ def create_dataset(dataset_name, rebuild=True, dataset_type = None, get_sampleli class Dataset_Types(object): - def __init__(self, rebuild=False): + def __init__(self): """Create a dictionary of samples where the value is set to Geno, Publish or ProbeSet. E.g. @@ -93,13 +93,9 @@ Publish or ProbeSet. E.g. """ self.datasets = {} - if rebuild: #ZS: May make this the only option - 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" - with open(file_name, 'r') as fh: - data = json.load(fh) + data = json.loads(requests.get(GN2_BASE_URL + "/api/v_pre1/gen_dropdown").content) + #data = gen_menu.gen_dropdown_json() + for species in data['datasets']: for group in data['datasets'][species]: diff --git a/wqflask/wqflask/api/gen_menu.py b/wqflask/wqflask/api/gen_menu.py index 64a413c2..adf66fb5 100644 --- a/wqflask/wqflask/api/gen_menu.py +++ b/wqflask/wqflask/api/gen_menu.py @@ -36,11 +36,6 @@ def gen_dropdown_json(): types=types, datasets=datasets) - output_file = """./wqflask/static/new/javascript/dataset_menu_structure.json""" - - with open(output_file, 'w') as fh: - json.dump(data, fh, indent=3, sort_keys=True) - return data def get_species(): |