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

EntranceSlug removed from data model.

Browse Source
This commit is contained in:
Philip Sargent
2023-03-28 19:26:37 +01:00
parent 5738da8566
commit 9a28e93ac6
4 changed files with 33 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
parsers/caves.py
View File

@@ -5,7 +5,7 @@ from pathlib import Path
from django.conf import settings
from django.db import transaction
from troggle.core.models.caves import Area, Cave, CaveAndEntrance, Entrance, EntranceSlug, GetCaveLookup
from troggle.core.models.caves import Area, Cave, CaveAndEntrance, Entrance, GetCaveLookup #EntranceSlug,
from troggle.core.models.logbooks import CaveSlug
from troggle.core.models.troggle import DataIssue
from troggle.settings import CAVEDESCRIPTIONS, ENTRANCEDESCRIPTIONS, EXPOWEB, SURVEX_DATA
@@ -46,19 +46,19 @@ def dummy_entrance(k, slug, msg="DUMMY"):
marking="?",
)
if ent:
try: # Now create a entranceslug object
EntranceSlug(entrance=ent, slug=slug)
except:
message = f" ! {k:11s} {msg}-{slug} entrance create failure"
DataIssue.objects.create(parser="entrances", message=message, url=f"{slug}")
print(message)
# try: # Now create a entranceslug object
# EntranceSlug(entrance=ent, slug=slug)
# except:
# message = f" ! {k:11s} {msg} cave SLUG '{slug}' create failure"
# DataIssue.objects.create(parser="entrances", message=message, url=f"{slug}")
# print(message)
# ent.cached_slug = slug
# ent.filename = slug + ".html"
# ent.save()
# # ent.cached_slug = slug
# # ent.filename = slug + ".html"
# # ent.save()
return ent
else:
message = f" ! {k:11s} {msg} cave SLUG '{slug}' create failure"
message = f" ! {k:11s} {msg}-{slug} {k} entrance create failure"
DataIssue.objects.create(parser="entrances", message=message, url=f"{slug}")
print(message)
raise
@@ -82,13 +82,13 @@ def set_dummy_entrance(id, slug, cave, msg="DUMMY"):
DataIssue.objects.create(parser="entrances", message=message, url=f"{cave.url}")
print(message)
try:
EntranceSlug.objects.update_or_create(entrance=entrance, slug=slug)
except:
# raise
message = f' ! EntranceSlug setting failure for Dummy cave, slug:"{slug}" cave id :"{id}" '
DataIssue.objects.create(parser="entrances", message=message, url=f"{cave.url}")
print(message)
# try:
# EntranceSlug.objects.update_or_create(entrance=entrance, slug=slug)
# except:
# # raise
# message = f' ! EntranceSlug setting failure for Dummy cave, slug:"{slug}" cave id :"{id}" '
# DataIssue.objects.create(parser="entrances", message=message, url=f"{cave.url}")
# print(message)
def make_areas():
print(" - Creating Areas 1623, 1624, 1627 and 1626")
@@ -283,13 +283,6 @@ def do_pending_cave(k, url, area):
try:
set_dummy_entrance(k, slug, cave, msg="PENDING")
# ent = dummy_entrance(k, slug, msg="PENDING")
# ceinsts = CaveAndEntrance.objects.update_or_create(cave=cave, entrance_letter="", entrance=ent)
# for ceinst in ceinsts:
# if str(ceinst) == str(cave): # magic runes... why is the next value a Bool?
# ceinst.cave = cave
# ceinst.save()
# break
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}' [{ent}]"
@@ -341,7 +334,7 @@ def readentrance(filename):
other_description = getXML(entrancecontents, "other_description", maxItems=1, context=context)
bearings = getXML(entrancecontents, "bearings", maxItems=1, context=context)
url = getXML(entrancecontents, "url", maxItems=1, context=context)
# if len(non_public) == 1 and len(slugs) >= 1 and len(name) >= 1 and len(entrance_description) == 1 and len(explorers) == 1 and len(map_description) == 1 and len(location_description) == 1 and len(lastvisit) == 1 and len(approach) == 1 and len(underground_description) == 1 and len(marking) == 1 and len(marking_comment) == 1 and len(findability) == 1 and len(findability_description) == 1 and len(alt) == 1 and len(northing) == 1 and len(easting) == 1 and len(tag_station) == 1 and len(exact_station) == 1 and len(other_station) == 1 and len(other_description) == 1 and len(bearings) == 1 and len(url) == 1:
e, state = Entrance.objects.update_or_create(
name=name[0],
non_public={