diff --git a/core/views/statistics.py b/core/views/statistics.py index a67ef08..ec228b4 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -204,6 +204,7 @@ def get_paths_dict(): "JSLIB_ROOT": str(settings.JSLIB_ROOT), "CAVEDESCRIPTIONS": str(settings.CAVEDESCRIPTIONS), "ENTRANCEDESCRIPTIONS": str(settings.ENTRANCEDESCRIPTIONS), + "EXPOFILES": str(settings.EXPOFILES), "EXPOUSER_EMAIL": str(settings.EXPOUSER_EMAIL), "EXPOUSERPASS": str(""), "EXPOUSER": str(settings.EXPOUSER), @@ -233,6 +234,7 @@ def get_paths_type_dict(): "JSLIB_ROOT": type(settings.JSLIB_ROOT), "CAVEDESCRIPTIONS": type(settings.CAVEDESCRIPTIONS), "ENTRANCEDESCRIPTIONS": type(settings.ENTRANCEDESCRIPTIONS), + "EXPOFILES": type(settings.EXPOFILES), "EXPOUSER_EMAIL": type(settings.EXPOUSER_EMAIL), "EXPOUSERPASS": type(settings.EXPOUSERPASS), "EXPOUSER": type(settings.EXPOUSER), @@ -266,111 +268,29 @@ def pathsreport(request): pathsdict["! EXCEPTION !"] = str(e) pathstype["! EXCEPTION !"] = str(e) - bycodeslist2 = [(k, p, str(pathstype.get(k, ""))) for k, p in sorted(pathsdict.items())] - bypathslist = [(p, k, str(pathstype.get(k, ""))) for k, p in pathsdict.items()] + bycodeslist = [(k, p, str(pathstype.get(k, ""))) for k, p in sorted(pathsdict.items())] + #bypathslist = [(p, k, str(pathstype.get(k, ""))) for k, p in pathsdict.items()] ncodes = len(pathsdict) + bypaths = sorted(pathsdict.values()) # a list, sorted on paths + bypathslist = [] + + for p in bypaths: + for k in pathsdict.keys(): + if pathsdict[k] == p: + bypathslist.append((p, k, str(pathstype[k]))) + del pathsdict[k] + break + context = { "pathsdict": pathsdict, - "bycodeslist": bycodeslist2, - "bypathslist": bypathslist, + "bycodeslist": bycodeslist, # sorted fine + "bypathslist": bypathslist, # sorting not working "ncodes": ncodes, "year": current_expo(), } return render(request, "pathsreport.html", context) -def pathsreport_old(request): - """The CONSTANTs declared in the settings and localsettings and how they have - been evaluated for this specific installation - live""" - pathsdict = OrderedDict() - try: - pathsdict = { - # "BOGUS" : str( settings.BOGUS), - "JSLIB_URL": str(settings.JSLIB_URL), - "JSLIB_ROOT": str(settings.JSLIB_ROOT), - "CAVEDESCRIPTIONS": str(settings.CAVEDESCRIPTIONS), - "ENTRANCEDESCRIPTIONS": str(settings.ENTRANCEDESCRIPTIONS), - "EXPOUSER_EMAIL": str(settings.EXPOUSER_EMAIL), - "EXPOUSERPASS": str(""), - "EXPOUSER": str(settings.EXPOUSER), - "EXPOWEB": str(settings.EXPOWEB), - "LIBDIR": str(settings.LIBDIR), - "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), - "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), - "SURVEXPORT": str(settings.SURVEXPORT), - "DRAWINGS_DATA": str(settings.DRAWINGS_DATA), - "URL_ROOT": str(settings.URL_ROOT), - } - except: - pathsdict["! EXCEPTION !"] = "missing or exta string constant in troggle/settings" - - pathstype = OrderedDict() - try: - pathstype = { - # "BOGUS" : type(settings.BOGUS), - "JSLIB_URL": type(settings.JSLIB_URL), - "JSLIB_ROOT": type(settings.JSLIB_ROOT), - "CAVEDESCRIPTIONS": type(settings.CAVEDESCRIPTIONS), - "ENTRANCEDESCRIPTIONS": type(settings.ENTRANCEDESCRIPTIONS), - "EXPOUSER_EMAIL": type(settings.EXPOUSER_EMAIL), - "EXPOUSERPASS": type(settings.EXPOUSERPASS), - "EXPOUSER": type(settings.EXPOUSER), - "EXPOWEB": type(settings.EXPOWEB), - "LIBDIR": type(settings.LIBDIR), - "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), - "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), - "SURVEXPORT": type(settings.SURVEXPORT), - "DRAWINGS_DATA": type(settings.DRAWINGS_DATA), - "URL_ROOT": type(settings.URL_ROOT), - } - except: - pathstype["! EXCEPTION !"] = "missing or exta string constant in troggle/settings" - raise - - # settings are unique by paths are not - ncodes = len(pathsdict) - bycodeslist = sorted(pathsdict.items()) # a list of tuples - bycodeslist2 = [] - - for k, p in bycodeslist: - bycodeslist2.append((k, p, str(pathstype[k]))) - - bypaths = sorted(pathsdict.values()) # a list - bypathslist = [] - - for p in bypaths: - for k in pathsdict.keys(): - if pathsdict[k] == p: - bypathslist.append((p, k, str(pathstype[k]))) - del pathsdict[k] - break - - return render( - request, - "pathsreport.html", - {"pathsdict": pathsdict, "bycodeslist": bycodeslist2, "bypathslist": bypathslist, "ncodes": ncodes, "year": current_expo()}, - ) - - - - + def dataissues(request): """Each issue has a parser, a message and a url linking to the offending object after loading