diff options
| author | Zachary Sloan | 2013-07-18 15:06:40 -0500 |
|---|---|---|
| committer | Zachary Sloan | 2013-07-18 15:06:40 -0500 |
| commit | 89c4dc078c6371e4bc56bf8708fc7dca6c49b350 (patch) | |
| tree | 2c6fa9e5c78fa3252b52c537a9cb24c2f1437a44 /wqflask/maintenance | |
| parent | d9065d1b94c3305f06c4ee368d4b0850b3a96e21 (diff) | |
| parent | 1a3a456eb7635337a966913f2e2e75c8a89bb92e (diff) | |
| download | genenetwork2-89c4dc078c6371e4bc56bf8708fc7dca6c49b350.tar.gz | |
Merge branch 'master' of https://github.com/zsloan/genenetwork
Conflicts:
wqflask/base/webqtlConfigLocal.py
wqflask/maintenance/gen_select_dataset.py
wqflask/wqflask/static/new/javascript/dataset_menu_structure.json
Diffstat (limited to 'wqflask/maintenance')
| -rw-r--r-- | wqflask/maintenance/gen_select_dataset.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/wqflask/maintenance/gen_select_dataset.py b/wqflask/maintenance/gen_select_dataset.py index acf21ed8..d653fd2d 100644 --- a/wqflask/maintenance/gen_select_dataset.py +++ b/wqflask/maintenance/gen_select_dataset.py @@ -47,15 +47,6 @@ import urlparse from pprint import pformat as pf -#Engine = sa.create_engine(our_settings.SQLALCHEMY_DATABASE_URI) - -# build MySql database connection - -#conn = Engine.connect() - - - - def parse_db_uri(db_uri): """Converts a database URI to the db name, host name, user name, and password""" @@ -170,9 +161,13 @@ def build_datasets(species, group, type_name): def main(): """Generates and outputs (as json file) the data for the main dropdown menus on the home page""" +<<<<<<< HEAD parse_db_uri(our_settings.DB_URI) +======= + +>>>>>>> 1a3a456eb7635337a966913f2e2e75c8a89bb92e species = get_species() groups = get_groups(species) types = get_types(groups) |