diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/view_surveys.py | 3 | ||||
| -rw-r--r-- | core/views_caves.py | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/view_surveys.py b/core/view_surveys.py index c1fec57..dae6f31 100644 --- a/core/view_surveys.py +++ b/core/view_surveys.py @@ -9,7 +9,8 @@ from django.http import HttpResponse, Http404 from troggle.core.models_survex import ScansFolder, SingleScan, SurvexBlock, TunnelFile from troggle.flatpages import views as flatviews import parsers.surveys -#from . import fileAbstraction + + def fa_readFile(*path): try: diff --git a/core/views_caves.py b/core/views_caves.py index c4d06a1..5820857 100644 --- a/core/views_caves.py +++ b/core/views_caves.py @@ -74,7 +74,7 @@ def numericalcmp(x, y): return cmp(padnumber(x), padnumber(y)) def caveKey(x): - """python3 function for sort. + """python3 function for sort. Done in a hurry. Note that cave kataster numbers are not generally integers. This needs to be fixed make a decent sort order. """ @@ -89,7 +89,7 @@ def getnotablecaves(): cave = Cave.objects.get(kataster_number=kataster_number) notablecaves.append(cave) except: - print(" ! FAILED to get only one cave per kataster_number for: "+kataster_number) + print(" ! FAILED to get only one cave per kataster_number OR invalid number for: "+kataster_number) caves = Cave.objects.all().filter(kataster_number=kataster_number) for c in caves: print(c.kataster_number, c.slug()) @@ -102,7 +102,6 @@ def caveindex(request): caves = Cave.objects.all() caves1623 = list(Cave.objects.filter(area__short_name = "1623")) caves1626 = list(Cave.objects.filter(area__short_name = "1626")) - #python2 to python3 issue https://realpython.com/python-sort/ caves1623.sort(key=caveKey) caves1626.sort(key=caveKey) return render(request,'caveindex.html', {'caves1623': caves1623, 'caves1626': caves1626, 'notablecaves':getnotablecaves(), 'cavepage': True}) |