diff options
Diffstat (limited to 'parsers/caves.py')
| -rw-r--r-- | parsers/caves.py | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/parsers/caves.py b/parsers/caves.py index f6681b8..de7c8e8 100644 --- a/parsers/caves.py +++ b/parsers/caves.py @@ -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, GetCaveLookup #EntranceSlug, +from troggle.core.models.caves import Area, Cave, CaveAndEntrance, Entrance, GetCaveLookup from troggle.core.models.logbooks import CaveSlug from troggle.core.models.troggle import DataIssue from troggle.settings import CAVEDESCRIPTIONS, ENTRANCEDESCRIPTIONS, EXPOWEB, SURVEX_DATA @@ -46,16 +46,6 @@ 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} 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() return ent else: message = f" ! {k:11s} {msg}-{slug} {k} entrance create failure" @@ -81,14 +71,6 @@ def set_dummy_entrance(id, slug, cave, msg="DUMMY"): message = f' ! Entrance Dummy setting failure, 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") @@ -372,25 +354,6 @@ def readentrance(filename): message = f" ! - More than one slug for an entrance: {entrance}, slugs: {slugs}. Aborting." DataIssue.objects.create(parser="entrances", message=message, url=f"/cave/{slug}/edit/") print(message) - # for slug in slugs: - # # print("entrance slug:{} filename:{}".format(slug, filename)) - # try: - # EntranceSlug.objects.update_or_create(entrance=e, slug=slug) - # except: - # # need to cope with duplicates - # message = f" ! FAILED to get precisely one ENTRANCE when updating using: cave_entrance/{filename}" - # DataIssue.objects.create(parser="entrances", message=message, url=f"/cave/{slug}/edit/") - # # kents = EntranceSlug.objects.all().filter(entrance=e, slug=slug, primary=primary) - # kents = EntranceSlug.objects.all().filter(entrance=e, slug=slug) - # for k in kents: - # message = " ! - DUPLICATE in db. entrance:" + str(k.entrance) + ", slug:" + str(k.slug()) - # DataIssue.objects.create(parser="entrances", message=message, url=f"/cave/{slug}/edit/") - # print(message) - # for k in kents: - # if k.slug() is not None: - # print(" ! - OVERWRITING this one: slug:" + str(k.slug())) - # k.notes = "DUPLICATE entrance found on import. Please fix\n" + k.notes - def readcave(filename): """Reads an enrance description from the .html file |