diff options
author | Philip Sargent <philip.sargent@gmail.com> | 2023-03-28 17:08:55 +0100 |
---|---|---|
committer | Philip Sargent <philip.sargent@gmail.com> | 2023-03-28 17:08:55 +0100 |
commit | bbc13c4eb9a426f483aac48a97e76a1a1b08f053 (patch) | |
tree | f1e10e04f6d6f6b0818ad44e29b3e88a1b59f1f3 /parsers/caves.py | |
parent | 6ca5d5bfa83ef59a6ecc93a6ef9b12abf137be38 (diff) | |
download | troggle-bbc13c4eb9a426f483aac48a97e76a1a1b08f053.tar.gz troggle-bbc13c4eb9a426f483aac48a97e76a1a1b08f053.tar.bz2 troggle-bbc13c4eb9a426f483aac48a97e76a1a1b08f053.zip |
remove 'primary' concept from entrance slugs. tested.
Diffstat (limited to 'parsers/caves.py')
-rw-r--r-- | parsers/caves.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/parsers/caves.py b/parsers/caves.py index feb8fbb..3f88c45 100644 --- a/parsers/caves.py +++ b/parsers/caves.py @@ -48,13 +48,13 @@ def dummy_entrance(k, slug, msg="DUMMY"): if ent: ent.save() # must save to have id before foreign keys work. try: # Now create a entrance slug ID - EntranceSlug(entrance=ent, slug=slug, primary=False) + EntranceSlug(entrance=ent, slug=slug) except: message = f" ! {k:11s} {msg}-{slug} entrance create failure" DataIssue.objects.create(parser="caves", message=message, url=f"{slug}") print(message) - ent.cached_primary_slug = slug + ent.cached_slug = slug ent.filename = slug + ".html" ent.save() return ent @@ -362,13 +362,12 @@ def readentrance(filename): bearings=bearings[0], url=url[0], filename=filename, - cached_primary_slug=slugs[0], + cached_slug=slugs[0], ) - primary = True for slug in slugs: # print("entrance slug:{} filename:{}".format(slug, filename)) try: - EntranceSlug.objects.update_or_create(entrance=e, slug=slug, primary=primary) + 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}" @@ -383,7 +382,6 @@ def readentrance(filename): 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 - primary = False # else: # more than one item in long list. But this is not an error, and the max and min have been checked by getXML # slug = Path(filename).stem # message = f' ! ABORT loading this entrance. in "{filename}"' |