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

Fixed cave order

Browse Source
This commit is contained in:
expo 2012-08-05 19:26:24 +02:00
parent 0785455bac
commit 2208f0748b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/views_caves.py
View File

@ -21,14 +21,26 @@ def getCave(cave_id):
cave = Cave.objects.get(unofficial_number=cave_id) cave = Cave.objects.get(unofficial_number=cave_id)
return cave return cave
def pad5(x):
return "0" * (5 -len(x.group(0))) + x.group(0)
def padnumber(x):
return re.sub("\d+", pad5, x)
def numericalcmp(x, y):
return cmp(padnumber(x), padnumber(y))
def caveCmp(x, y): def caveCmp(x, y):
if x.kataster_number: if x.kataster_number:
if y.kataster_number: if y.kataster_number:
return cmp(x.kataster_number, y.kataster_number) return numericalcmp(x.kataster_number, y.kataster_number)
else: else:
return -1 return -1
else: else:
if y.kataster_number:
return 1 return 1
else:
return numericalcmp(x.unofficial_number, y.unofficial_number)
def caveindex(request): def caveindex(request):
caves = Cave.objects.all() caves = Cave.objects.all()