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

fix non-appearing cave id info on wallets

Browse Source
This commit is contained in:
Philip Sargent
2025-07-12 17:30:40 +03:00
parent dbec098bba
commit 5f1b01bea7
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/models/caves.py
View File

@@ -53,18 +53,10 @@ class CaveAndEntrance(models.Model):
def get_cave_leniently(caveid): def get_cave_leniently(caveid):
try: Gcavelookup = GetCaveLookup()
c = getCave(caveid) if caveid in Gcavelookup:
if c: return Gcavelookup[caveid]
return c
except:
# print(f"get_cave_leniently FAIL {caveid}")
try:
c = getCave("1623-"+caveid)
if c:
return c
except:
return None
class Cave(TroggleModel): class Cave(TroggleModel):
# (far) too much here perhaps, # (far) too much here perhaps,

12
core/models/wallets.py
View File

@@ -245,13 +245,21 @@ class Wallet(models.Model):
return None return None
#cavelist = jsondata["cave"] #cavelist = jsondata["cave"]
cavelist = Wallet.input_to_list(jsondata["cave"]) cavelist = Wallet.input_to_list(jsondata["cave"])
from troggle.core.models.troggle import DataIssue
for i in cavelist: for i in cavelist:
if not i:
continue
#print(f"Attempting adding cave '{i}' to wallet {self} ")
try: try:
caveobject = get_cave_leniently(i) caveobject = get_cave_leniently(i.strip())
print(f"Attempting adding cave '{caveobject}' to wallet {self} ")
if caveobject: if caveobject:
self.caves.add(caveobject) self.caves.add(caveobject)
except: except:
print(f"FAIL adding cave to wallet.caves '{i}'") message = f"FAIL adding cave {caveobject} to wallet.caves '{i}'"
DataIssue.objects.update_or_create(parser="wallets", message=message, url=wurl)
print(message)
pass pass
def year(self): def year(self):