diff options
Diffstat (limited to 'parsers')
| -rw-r--r-- | parsers/caves.py | 32 | ||||
| -rw-r--r-- | parsers/logbooks.py | 2 |
2 files changed, 3 insertions, 31 deletions
diff --git a/parsers/caves.py b/parsers/caves.py index c1f8094..0a5f2b2 100644 --- a/parsers/caves.py +++ b/parsers/caves.py @@ -9,7 +9,6 @@ from django.conf import settings from django.db import transaction from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, GetCaveLookup -from troggle.core.models.logbooks import CaveSlug from troggle.core.models.survex import SurvexStation from troggle.core.models.troggle import DataIssue from troggle.settings import CAVEDESCRIPTIONS, ENTRANCEDESCRIPTIONS, EXPOWEB, SURVEX_DATA @@ -235,12 +234,6 @@ def do_ARGE_cave(slug, caveid, areacode, svxid): cave.save() - try: # Now create a cave slug ID - CaveSlug.objects.update_or_create(cave=cave, slug=slug, primary=False) - except: - message = f" ! {slug:11s} ARGE CaveSLUG create failure {caveid=} {url=} {areacode=} {svxid=}" - DataIssue.objects.create(parser="caves", message=message) - print(message) else: message = f" ! {slug:11s} ARGE cave create failure {caveid=} {url=} {areacode=} {svxid=}" DataIssue.objects.create(parser="caves", message=message) @@ -368,12 +361,6 @@ def do_pending_cave(slug, caveid, url, areacode, msg=None): DataIssue.objects.create(parser="caves", message=message, url=url) print(message) - try: # Now create a cave slug ID - CaveSlug.objects.update_or_create(cave=cave, slug=slug, primary=False) - except: - message = f" ! {slug:11s} PENDING CaveSLUG {slug} create failure - {msg}" - DataIssue.objects.create(parser="caves", message=message) - print(message) else: message = f" ! {slug:11s} PENDING cave create failure - {msg}" DataIssue.objects.create(parser="caves", message=message) @@ -609,7 +596,7 @@ def make_cave(slug): except: print(f" ! FAILED to get only one CAVE in db when updating using: {filename} or not found.") - kaves = Cave.objects.all().filter(filename=filename) # replace with slug when CaveSlug tidied up + kaves = Cave.objects.all().filter(filename=filename) # assumes filename unique, eeugh. for k in kaves: message = " ! - DUPLICATES in db. kataster:" + str(k.kataster_number) + ", slug:" + str(k.slug()) DataIssue.objects.create(parser="caves", message=message, url=context) @@ -723,22 +710,7 @@ def read_cave(filename, mvf=None, cave=None): Pending destruction of this whole concept and Class CaveSlug What is Class CaveSlug for? """ - #return - primary = True # this sets the first thing we find to be primary=True and all the others =False - for slug in slugs: - if slug in caves_xslug: - cs = caves_xslug[slug] - else: - try: - cs = CaveSlug.objects.update_or_create(cave=cave, slug=slug, primary=primary) - caves_xslug[slug] = cs - except Exception as ex: - #raise - # This fails to do an update! It just crashes.. to be fixed - message = f" ! CaveSlug update/create failure : {slug}, skipping cave_data file {slug} with exception\nException: {ex.__class__}" - DataIssue.objects.create(parser="caves", message=message, url=context) - print(message) - primary = False + return def check_directory(areacode, caveid, url, cave): dir = Path(settings.EXPOWEB, areacode, caveid) diff --git a/parsers/logbooks.py b/parsers/logbooks.py index b122250..d5580a1 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -269,7 +269,7 @@ def store_entry_into_database(date, place, tripcave, title, text, trippersons, a "text": text, "expedition": expedition, "time_underground": logtime_underground, - "cave_slug": str(tripcave), + "cave": tripcave, } coUniqueAttribs = {"slug": tid, "date": date, "title": title} if LogbookEntry.objects.filter(slug=tid).exists(): |