expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-15 12:27:05 +00:00
Code Issues 18 Projects 3 Activity

GetCave:Lookup neeeds work

Browse Source
This commit is contained in:
Philip Sargent
2022-07-24 21:38:14 +03:00
parent 5007393536
commit de7388bdc5
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/models/caves.py
View File

@@ -567,7 +567,9 @@ class PersonTrip(TroggleModel):
Gcavelookup = None Gcavelookup = None
Gcave_count = None Gcave_count = None
def GetCaveLookup(): def GetCaveLookup():
"""lookup function modelled on GetPersonExpeditionNameLookup """A very relaxed way of finding probably the right cave given almost any string which might serve to identify it
lookup function modelled on GetPersonExpeditionNameLookup
repeated assignment each call, needs refactoring repeated assignment each call, needs refactoring
Used when parsing wallets contents.json file too in views/uploads.py Used when parsing wallets contents.json file too in views/uploads.py
@@ -590,7 +592,9 @@ def GetCaveLookup():
Gcave_count[key] += 1 Gcave_count[key] += 1
if cave.kataster_number: if cave.kataster_number:
Gcavelookup[cave.kataster_number] = cave # DUPLICATE as we have 1623-55 and 1626-55 Gcavelookup[cave.kataster_number] = cave # DUPLICATE as we have 1623-55 and 1626-55
Gcavelookup[f'{cave.area}-{cave.kataster_number}'] = cave
Gcave_count[cave.kataster_number] += 1 Gcave_count[cave.kataster_number] += 1
Gcave_count[f'{cave.area}-{cave.kataster_number}'] += 1
if cave.unofficial_number: if cave.unofficial_number:
Gcavelookup[cave.unofficial_number.lower()] = cave Gcavelookup[cave.unofficial_number.lower()] = cave
Gcave_count[cave.unofficial_number.lower()] += 1 Gcave_count[cave.unofficial_number.lower()] += 1
@@ -733,6 +737,9 @@ def GetCaveLookup():
Gcavelookup["homecoming"] = Gcavelookup["2018-dm-07"] Gcavelookup["homecoming"] = Gcavelookup["2018-dm-07"]
Gcavelookup["heimkommen"] = Gcavelookup["2018-dm-07"] Gcavelookup["heimkommen"] = Gcavelookup["2018-dm-07"]
Gcavelookup["99ob02"] = Gcavelookup["1999-ob-02"] Gcavelookup["99ob02"] = Gcavelookup["1999-ob-02"]
#Gcavelookup["1626-354"] = Gcavelookup["354"]
except: except:
raise raise