expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 07:11:52 +00:00
Code Issues 19 Projects 3 Activity

properly turn off automagic entrance creation

Browse Source
This commit is contained in:
Philip Sargent 2023-07-26 01:23:49 +03:00
parent fab7adf079
commit 1f656b2101
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
parsers/caves.py
View File

@ -85,23 +85,18 @@ def set_dummy_entrance(id, slug, cave, msg="DUMMY"):
so so
""" """
global entrances_xslug global entrances_xslug
message = f" - Note: Missing Entrance for entrance '{id}' on cave '{cave}'" message = f" - Note: Missing Entrance for entrance '{id}' on cave '{cave}' - Is this a problem?"
DataIssue.objects.create(parser="entrances", message=message, url=f"{cave.url}") DataIssue.objects.create(parser="entrances", message=message, url=f"{cave.url}")
try:
# I am not sure if we want entrances automagically created. # try:
# Therefore I have commented it out. MJG # entrance = dummy_entrance(id, slug, msg="DUMMY")
# entrances_xslug[slug] = entrance
# Automagic restored, as it creates a load of error message in the DataIssue log. 2023-07-25 # CaveAndEntrance.objects.update_or_create(cave=cave, entrance_letter="", entrance=entrance)
# pending doing this properly, ie. properly creating an XML file for each of these pending caves. # pass
# except:
entrance = dummy_entrance(id, slug, msg="DUMMY") # message = f' ! Entrance Dummy setting failure, slug:"{slug}" cave id :"{id}" '
entrances_xslug[slug] = entrance # DataIssue.objects.create(parser="entrances", message=message, url=f"{cave.url}")
CaveAndEntrance.objects.update_or_create(cave=cave, entrance_letter="", entrance=entrance) # print(message)
pass
except:
message = f' ! Entrance Dummy setting failure, slug:"{slug}" cave id :"{id}" '
DataIssue.objects.create(parser="entrances", message=message, url=f"{cave.url}")
print(message)
def make_areas(): def make_areas():
print(" - Creating Areas 1623, 1624, 1627 and 1626") print(" - Creating Areas 1623, 1624, 1627 and 1626")
@ -298,7 +293,9 @@ def do_pending_cave(k, caveid, url, area):
print(message) print(message)
try: try:
set_dummy_entrance(k, slug, cave, msg="PENDING") # troggle is more robust against missing entrances now, not needed.
# set_dummy_entrance(k, slug, cave, msg="PENDING")
pass
except: except:
message = f" ! {k:11s} PENDING entrance + cave UNION create failure '{cave}' [{slug}] {k}" message = f" ! {k:11s} PENDING entrance + cave UNION create failure '{cave}' [{slug}] {k}"
# message = f" ! {k:11s} PENDING entrance + cave UNION create failure '{cave}' [{ent}]" # message = f" ! {k:11s} PENDING entrance + cave UNION create failure '{cave}' [{ent}]"
@ -726,7 +723,7 @@ def readcaves():
DataIssue.objects.filter(parser="areas").delete() DataIssue.objects.filter(parser="areas").delete()
DataIssue.objects.filter(parser="caves").delete() DataIssue.objects.filter(parser="caves").delete()
DataIssue.objects.filter(parser="caves ok").delete() DataIssue.objects.filter(parser="caves ok").delete()
DataIssue.objects.filter(parser="entrances").delete() #DataIssue.objects.filter(parser="entrances").delete()
with transaction.atomic(): with transaction.atomic():
area = get_area("1623") area = get_area("1623")
@ -766,7 +763,7 @@ def readcaves():
try: try:
do_pending_cave(k, number, url, area) do_pending_cave(k, number, url, area)
except: except:
message = f" ! Error. Cannot create pending cave and entrance, pending-id:{k} in area {areanum}" message = f" ! Error. Cannot create pending cave, pending-id:{k} in area {areanum}"
DataIssue.objects.create(parser="caves", message=message) DataIssue.objects.create(parser="caves", message=message)
print(message) print(message)
raise raise