xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Fixed cave sort-order in cave index

Browse Source
This commit is contained in:
Philip Sargent
2021-04-16 16:01:35 +01:00
parent 16ef4fa9fb
commit 49277216ba
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/views/caves.py
View File

@@ -69,14 +69,18 @@ def padnumber(x):
def numericalcmp(x, y):
return cmp(padnumber(x), padnumber(y))
def caveKey(x):
"""python3 function for sort. Done in a hurry.
Note that cave kataster numbers are not always integers.
This needs to be fixed make a decent sort order.
def caveKey(c):
"""This function goes into a lexicogrpahic sort function, and the values are strings,
but we want to sort numberically on kataster number before sorting on unofficial number.
"""
if not x.kataster_number:
return "~"
return x.kataster_number
if not c.kataster_number:
return "9999." + c.unofficial_number
else:
if int(c.kataster_number) >= 100:
return "99." + c.kataster_number
if int(c.kataster_number) >= 10:
return "9." + c.kataster_number
return c.kataster_number
def getnotablecaves():
notablecaves = []