From c39e0fbf9c57ebae38a73be0db6f99f8a393dd9a Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Tue, 31 May 2016 06:50:39 +0000
Subject: Allow the json dir to be in the old location.

---
 wqflask/base/webqtlConfig.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py
index d0016b33..f6140ac3 100644
--- a/wqflask/base/webqtlConfig.py
+++ b/wqflask/base/webqtlConfig.py
@@ -8,7 +8,7 @@
 # 
 #########################################
 
-from utility.tools import mk_dir, assert_dir, flat_files, TEMPDIR
+from utility.tools import valid_path, mk_dir, assert_dir, flat_files, TEMPDIR
 
 #Debug Level
 #1 for debug, mod python will reload import each time
@@ -69,7 +69,11 @@ GENERATED_TEXT_DIR   = mk_dir(TMPDIR+'/generated_text/')
 
 # Flat file directories
 GENODIR              = flat_files('genotype')+'/'
-JSON_GENODIR         = flat_files('json')+'/'
+JSON_GENODIR         = flat_files('genotype/json')+'/'
+if not valid_path(JSON_GENODIR):
+    # fall back on old location (move the dir, FIXME)
+    JSON_GENODIR = flat_files('json')
+assert_dir(GENODIR)
 
 PORTADDR = "http://50.16.251.170"
 
-- 
cgit v1.2.3