2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-18 01:57:18 +00:00

still some bugs in cave ids

This commit is contained in:
2024-07-02 20:01:15 +03:00
parent c58f2716b0
commit 704ff8335d
2 changed files with 75 additions and 42 deletions

View File

@@ -108,6 +108,7 @@ class Cave(TroggleModel):
ordering = ("kataster_code", "unofficial_number")
def slug(self):
return self.newslug()
primarySlugs = self.caveslug_set.filter(primary=True)
if primarySlugs:
return primarySlugs[0].slug
@@ -115,6 +116,8 @@ class Cave(TroggleModel):
slugs = self.caveslug_set.filter()
if slugs:
return slugs[0].slug
else:
return str(self.id)
def newslug(self):
return f"{self.areacode}-{self.number()}"
@@ -521,9 +524,12 @@ def GetCaveLookup():
checkcaveid(cave, fn)
if cave.slug():
# also possibly done already
slug = cave.slug().lower()
checkcaveid(cave, slug)
# also possibly done already. checking for weird slug values..
try:
slug = cave.slug().lower()
checkcaveid(cave, slug)
except:
print(cave, cave.slug())
# These might alse create more duplicate entries
# Yes, this should be set in, and imported from, an easily editable file
@@ -667,9 +673,7 @@ def GetCaveLookup():
("gsh", "1623-291"),
("1623-2023-lc-01", "1623-318"),
("tempest", "1623-2023-lc-01"),
("1623-2023-kt-02", "2023-kt-02"),
# from the git output after Becka's changes, used to construct this list..
# rename caves-1623/{2023-ASH-15/2023-ASH-15.svx => 303/303.svx} (94%)
# rename caves-1623/{2023-mg-02/2023-mg-02.svx => 304/304.svx} (90%)
@@ -753,7 +757,6 @@ def GetCaveLookup():
DataIssue.objects.update_or_create(parser="aliases", message=message)
else:
message = f" * Coding or cave existence mistake, cave for id '{alias}' does not exist. Expecting to set alias '{key}' to it"
print(message)
DataIssue.objects.update_or_create(parser="aliases", message=message)
addmore = {}