mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2025-12-17 09:47:24 +00:00
fix non-appearing cave id info on wallets
This commit is contained in:
@@ -53,18 +53,10 @@ class CaveAndEntrance(models.Model):
|
||||
|
||||
|
||||
def get_cave_leniently(caveid):
|
||||
try:
|
||||
c = getCave(caveid)
|
||||
if c:
|
||||
return c
|
||||
except:
|
||||
# print(f"get_cave_leniently FAIL {caveid}")
|
||||
try:
|
||||
c = getCave("1623-"+caveid)
|
||||
if c:
|
||||
return c
|
||||
except:
|
||||
return None
|
||||
Gcavelookup = GetCaveLookup()
|
||||
if caveid in Gcavelookup:
|
||||
return Gcavelookup[caveid]
|
||||
|
||||
|
||||
class Cave(TroggleModel):
|
||||
# (far) too much here perhaps,
|
||||
|
||||
@@ -245,13 +245,21 @@ class Wallet(models.Model):
|
||||
return None
|
||||
#cavelist = jsondata["cave"]
|
||||
cavelist = Wallet.input_to_list(jsondata["cave"])
|
||||
from troggle.core.models.troggle import DataIssue
|
||||
for i in cavelist:
|
||||
if not i:
|
||||
continue
|
||||
#print(f"Attempting adding cave '{i}' to wallet {self} ")
|
||||
try:
|
||||
caveobject = get_cave_leniently(i)
|
||||
caveobject = get_cave_leniently(i.strip())
|
||||
print(f"Attempting adding cave '{caveobject}' to wallet {self} ")
|
||||
if caveobject:
|
||||
self.caves.add(caveobject)
|
||||
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
|
||||
|
||||
def year(self):
|
||||
|
||||
Reference in New Issue
Block a user