diff options
| author | Philip Sargent <philip.sargent@gmail.com> | 2023-03-28 20:05:38 +0100 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@gmail.com> | 2023-03-28 20:05:38 +0100 |
| commit | e7d9e9402a2a21e0825adc9ad7f4c1327f4c1daf (patch) | |
| tree | 6f3df7e5b102f42f9e62b71790b0bbd748f237fd /parsers/caves.py | |
| parent | 3ef5c1aa0bf20d27b00c1f74371f68b2434421dc (diff) | |
| download | troggle-e7d9e9402a2a21e0825adc9ad7f4c1327f4c1daf.tar.gz troggle-e7d9e9402a2a21e0825adc9ad7f4c1327f4c1daf.tar.bz2 troggle-e7d9e9402a2a21e0825adc9ad7f4c1327f4c1daf.zip | |
bugfixes
Diffstat (limited to 'parsers/caves.py')
| -rw-r--r-- | parsers/caves.py | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/parsers/caves.py b/parsers/caves.py index e5e6811..f6681b8 100644 --- a/parsers/caves.py +++ b/parsers/caves.py @@ -372,24 +372,24 @@ 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 + # 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): @@ -541,7 +541,8 @@ def readcave(filename): if eslug in entrances_xslug: entrance = entrances_xslug[eslug] else: - entrance = Entrance.objects.get(entranceslug__slug=eslug) + # entrance = Entrance.objects.get(entranceslug__slug=eslug) + entrance = Entrance.objects.get(slug=eslug) entrances_xslug[eslug] = entrance CaveAndEntrance.objects.update_or_create( cave=c, entrance_letter=letter, entrance=entrance |