tidy settigs PATHs

1 files changed, 5 insertions, 19 deletions

diff --git a/core/views/statistics.py b/core/views/statistics.py
index ff0c879..774336e 100644
--- a/core/views/statistics.py
+++ b/core/views/statistics.py
@@ -81,7 +81,7 @@ def svxfilewild(request, year=None):
 def therionissues(request):
     """Page displaying contents of a file produced during data import"""
     logname = "therionrefs.log"
-    logpath = Path(settings.PYTHON_PATH, logname)
+    logpath = settings.TROGGLE_PATH / logname
     therionlog = []
     newlog = []
 
@@ -106,7 +106,7 @@ def therionissues(request):
 def surveximport(request):
     """Page displaying contents of a file produced during data import"""
     logname = "svxlinear.log"
-    logpath = Path(settings.PYTHON_PATH, logname)
+    logpath = settings.TROGGLE_PATH / logname
 
     if Path(logpath).is_file:
         with open(logpath, "r") as f:
@@ -119,7 +119,7 @@ def surveximport(request):
 def survexdebug(request):
     """Page displaying contents of a file produced during data import"""
     logname = "svxblks.log"
-    logpath = Path(settings.PYTHON_PATH, logname)
+    logpath = settings.TROGGLE_PATH / logname
 
     if Path(logpath).is_file:
         with open(logpath, "r") as f:
@@ -138,31 +138,24 @@ def pathsreport(request):
             #       "BOGUS" : str( settings.BOGUS),
             "JSLIB_URL": str(settings.JSLIB_URL),
             "JSLIB_ROOT": str(settings.JSLIB_ROOT),
-            #       "CSSLIB_URL" : str( settings.CSSLIB_URL),
             "CAVEDESCRIPTIONS": str(settings.CAVEDESCRIPTIONS),
-            "DIR_ROOT": str(settings.DIR_ROOT),
             "ENTRANCEDESCRIPTIONS": str(settings.ENTRANCEDESCRIPTIONS),
             "EXPOUSER_EMAIL": str(settings.EXPOUSER_EMAIL),
             "EXPOUSERPASS": str("<redacted>"),
             "EXPOUSER": str(settings.EXPOUSER),
             "EXPOWEB": str(settings.EXPOWEB),
-            # "EXPOWEB_URL": str(settings.EXPOWEB_URL),
-            #       "FILES" : str( settings.FILES),
             "LIBDIR": str(settings.LIBDIR),
-            "LOGFILE": str(settings.LOGFILE),
             "LOGIN_REDIRECT_URL": str(settings.LOGIN_REDIRECT_URL),
             "MEDIA_ROOT": str(settings.MEDIA_ROOT),
             "MEDIA_URL": str(settings.MEDIA_URL),
             "PHOTOS_URL": str(settings.PHOTOS_URL),
             "PHOTOS_ROOT": str(settings.PHOTOS_ROOT),
-            "PYTHON_PATH": str(settings.PYTHON_PATH),
             "REPOS_ROOT_PATH": str(settings.REPOS_ROOT_PATH),
+            "TROGGLE_PATH": str(settings.TROGGLE_PATH),
             "ROOT_URLCONF": str(settings.ROOT_URLCONF),
             "STATIC_URL": str(settings.STATIC_URL),
             "SURVEX_DATA": str(settings.SURVEX_DATA),
             "SCANS_ROOT": str(settings.SCANS_ROOT),
-            #       "SURVEYS" : str( settings.SURVEYS),
-            #       "SCANS_URL" : str( settings.SCANS_URL),
             "SURVEXPORT": str(settings.SURVEXPORT),
             "DRAWINGS_DATA": str(settings.DRAWINGS_DATA),
             "URL_ROOT": str(settings.URL_ROOT),
@@ -176,31 +169,24 @@ def pathsreport(request):
             #       "BOGUS" : type(settings.BOGUS),
             "JSLIB_URL": type(settings.JSLIB_URL),
             "JSLIB_ROOT": type(settings.JSLIB_ROOT),
-            #       "CSSLIB_URL" : type(settings.CSSLIB_URL),
             "CAVEDESCRIPTIONS": type(settings.CAVEDESCRIPTIONS),
-            "DIR_ROOT": type(settings.DIR_ROOT),
             "ENTRANCEDESCRIPTIONS": type(settings.ENTRANCEDESCRIPTIONS),
             "EXPOUSER_EMAIL": type(settings.EXPOUSER_EMAIL),
             "EXPOUSERPASS": type(settings.EXPOUSERPASS),
             "EXPOUSER": type(settings.EXPOUSER),
             "EXPOWEB": type(settings.EXPOWEB),
-            # "EXPOWEB_URL": type(settings.EXPOWEB_URL),
-            #       "FILES" : type(settings.FILES),
             "LIBDIR": type(settings.LIBDIR),
-            "LOGFILE": type(settings.LOGFILE),
             "LOGIN_REDIRECT_URL": type(settings.LOGIN_REDIRECT_URL),
             "MEDIA_ROOT": type(settings.MEDIA_ROOT),
             "MEDIA_URL": type(settings.MEDIA_URL),
             "PHOTOS_ROOT": type(settings.PHOTOS_ROOT),
             "PHOTOS_URL": type(settings.PHOTOS_URL),
-            "PYTHON_PATH": type(settings.PYTHON_PATH),
             "REPOS_ROOT_PATH": type(settings.REPOS_ROOT_PATH),
+            "TROGGLE_PATH": type(settings.TROGGLE_PATH),
             "ROOT_URLCONF": type(settings.ROOT_URLCONF),
             "STATIC_URL": type(settings.STATIC_URL),
             "SURVEX_DATA": type(settings.SURVEX_DATA),
             "SCANS_ROOT": type(settings.SCANS_ROOT),
-            #       "SURVEYS" : type(settings.SURVEYS),
-            #       "SCANS_URL" : type(settings.SCANS_URL),
             "SURVEXPORT": type(settings.SURVEXPORT),
             "DRAWINGS_DATA": type(settings.DRAWINGS_DATA),
             "URL_ROOT": type(settings.URL_ROOT),