update push procedure and fix order in pathsreport

1 files changed, 44 insertions, 35 deletions

diff --git a/core/views_statistics.py b/core/views_statistics.py
index 8fb968d..98e0fde 100644
--- a/core/views_statistics.py
+++ b/core/views_statistics.py
@@ -1,6 +1,7 @@
 import datetime
 import os.path
 import re
+from collections import OrderedDict
 
 import django.db.models
 from django.db.models import Min, Max
@@ -18,51 +19,59 @@ import troggle.settings as settings
 
 
 def pathsreport(request):
-    pathsdict={}
+    pathsdict = OrderedDict()
     try:
-        pathsdict={
-#       "BOGUS" : settings.BOGUS,
-        "CAVEDESCRIPTIONS" : settings.CAVEDESCRIPTIONS,
-        "DIR_ROOT" : settings.DIR_ROOT,
-        "ENTRANCEDESCRIPTIONS" : settings.ENTRANCEDESCRIPTIONS,
-        "EXPOUSER_EMAIL" : settings.EXPOUSER_EMAIL,
-        "EXPOUSERPASS" :"<redacted>",
-        "EXPOUSER" : settings.EXPOUSER,
-        "EXPOWEB" : settings.EXPOWEB,
-        "EXPOWEB_URL" : settings.EXPOWEB_URL,
-        "FILES" : settings.FILES,
-        "JSLIB_URL" : settings.JSLIB_URL,
-        "LOGFILE" : settings.LOGFILE,
-        "LOGIN_REDIRECT_URL" : settings.LOGIN_REDIRECT_URL,
-        "MEDIA_ROOT" : settings.MEDIA_ROOT,
-        "MEDIA_URL" : settings.MEDIA_URL,
-        "PHOTOS_URL" : settings.PHOTOS_URL,
-        "PYTHON_PATH" : settings.PYTHON_PATH,
-        "REPOS_ROOT_PATH" : settings.REPOS_ROOT_PATH,
-        "ROOT_URLCONF" : settings.ROOT_URLCONF,
-        "STATIC_URL" : settings.STATIC_URL,
-        "SURVEX_DATA" : settings.SURVEX_DATA,
-        "SURVEY_SCANS" : settings.SURVEY_SCANS,
-        "SURVEYS" : settings.SURVEYS,
-        "SURVEYS_URL" : settings.SURVEYS_URL,
-        "THREEDCACHEDIR" : settings.THREEDCACHEDIR,
-        "TUNNEL_DATA" : settings.TUNNEL_DATA,
-        "URL_ROOT" : settings.URL_ROOT
+        pathsdict = {
+#       "BOGUS" : str( settings.BOGUS),
+        "JSLIB_URL" : str( settings.JSLIB_URL),
+#       "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),
+        "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),
+        "PYTHON_PATH" : str( settings.PYTHON_PATH),
+        "REPOS_ROOT_PATH" : str( settings.REPOS_ROOT_PATH),
+        "ROOT_URLCONF" : str( settings.ROOT_URLCONF),
+        "STATIC_URL" : str( settings.STATIC_URL),
+        "SURVEX_DATA" : str( settings.SURVEX_DATA),
+        "SURVEY_SCANS" : str( settings.SURVEY_SCANS),
+        "SURVEYS" : str( settings.SURVEYS),
+        "SURVEYS_URL" : str( settings.SURVEYS_URL),
+        "SURVEXPORT" : str( settings.SURVEXPORT),
+        "THREEDCACHEDIR" : str( settings.THREEDCACHEDIR),
+        "TUNNEL_DATA" : str( settings.TUNNEL_DATA),
+        "URL_ROOT" : str( settings.URL_ROOT)
         }
     except:
         pathsdict["! EXCEPTION !"] = "missing string constant in troggle/settings"
 
     # settings are unique by paths are not
     ncodes = len(pathsdict)
-    bycodeslist = sorted(pathsdict.items())
+    bycodeslist = sorted(pathsdict.items()) # a list of tuples
+    bypaths = sorted(pathsdict.values()) # a list 
     
-    # create a temporary list
     bypathslist = []
+    
+    for p in bypaths:
+        for k in pathsdict.keys():
+            if pathsdict[k] == p:
+                bypathslist.append((p, k))
+                del pathsdict[k]
+                break
+    #bypaths = sorted(bycodeslist, key=bycodeslist[1])
     # iterate through the dictionary and append each tuple into the temporary list 
-    for key, value in pathsdict.items():
-        tmptuple = (key, value)
-        bypathslist.append(tmptuple)
-    # bypathslist = sorted(bypathslist)
+    #f#=or w in bypaths:
+     #   bypathslist[w] = pathsdict[w]
 
     return render(request, 'pathsreport.html', { 
         "pathsdict":pathsdict,