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

ambiguous aliases removed more thoroughly

Browse Source
This commit is contained in:
Philip Sargent 2023-07-27 00:38:47 +03:00
parent a86f251423
commit d93133c338
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/models/caves.py
View File

@ -472,6 +472,8 @@ def GetCaveLookup():
OR we could set it to return None if there are duplicates, and require the caller to OR we could set it to return None if there are duplicates, and require the caller to
fall back on doing the actual database query it wants rather thna using this cache shortcut fall back on doing the actual database query it wants rather thna using this cache shortcut
""" """
duplicates = {}
def checkcaveid(cave, id): def checkcaveid(cave, id):
global Gcavelookup global Gcavelookup
@ -482,11 +484,11 @@ def GetCaveLookup():
if cave == Gcavelookup[id]: if cave == Gcavelookup[id]:
pass # same id, same cave pass # same id, same cave
else: # same id but different cave else: # same id but different cave
message = f" - Warning: same alias id '{id:3}' for two caves '{Gcavelookup[id]}' and '{cave}'. Removing this shorthand alias entirely." # message = f" - Warning: ignoring alias id '{id:3}'. Caves '{Gcavelookup[id]}' and '{cave}'. "
Gcavelookup.pop(id) # print(message)
print(message) # DataIssue.objects.create(parser="aliases", message=message)
DataIssue.objects.create(parser="aliases", message=message) duplicates[id] = 1
global Gcavelookup global Gcavelookup
if Gcavelookup: if Gcavelookup:
return Gcavelookup return Gcavelookup
@ -499,8 +501,14 @@ def GetCaveLookup():
for cave in Cave.objects.all(): for cave in Cave.objects.all():
key = cave.official_name.lower() key = cave.official_name.lower()
if key != "" and key != "unamed" and key != "unnamed": if key != "" and key != "unamed" and key != "unnamed":
Gcavelookup[key] = cave if Gcave_count[key] > 0:
Gcave_count[key] += 1 # message = f" - Warning: ignoring alias id '{id:3}'. Caves '{Gcavelookup[id]}' and '{cave}'. "
# print(message)
# DataIssue.objects.create(parser="aliases", message=message)
duplicates[key] = 1
else:
Gcavelookup[key] = cave
Gcave_count[key] += 1
if cave.kataster_number: if cave.kataster_number:
checkcaveid(cave, cave.kataster_number) # we do expect 1623/55 and 1626/55 to cause a warning message checkcaveid(cave, cave.kataster_number) # we do expect 1623/55 and 1626/55 to cause a warning message
@ -665,11 +673,20 @@ def GetCaveLookup():
addmore = {} addmore = {}
ldup = []
for d in duplicates:
Gcavelookup.pop(d)
Gcave_count.pop(d)
ldup.append(d)
if ldup:
message = f" - Ambiguous aliases removed: {ldup}"
print(message)
DataIssue.objects.create(parser="aliases", message=message)
for c in Gcave_count: for c in Gcave_count:
if Gcave_count[c] > 1: if Gcave_count[c] > 1:
message = f" ** Duplicate cave id count={Gcave_count[c]} id:'{Gcavelookup[c]}' cave __str__:'{c}'" message = f" ** Duplicate cave id count={Gcave_count[c]} id:'{Gcavelookup[c]}' cave __str__:'{c}'"
print(message) print(message)
DataIssue.objects.create(parser="aliases", message=message) DataIssue.objects.create(parser="aliases", message=message)
# logdataissues[Gcavelookup[c]]=message # pending troggle-wide issues logging system
return Gcavelookup return Gcavelookup