diff options
author | Philip Sargent <philip.sargent@klebos.com> | 2020-06-28 01:50:34 +0100 |
---|---|---|
committer | Philip Sargent <philip.sargent@klebos.com> | 2020-06-28 01:50:34 +0100 |
commit | 122cdd7fc8620b2348d75b1bb786ae4202db9a55 (patch) | |
tree | da666e50f50b5a967f7948e4d4951efcaf142373 /parsers/logbooks.py | |
parent | 899ba13df49539ac8e055082c0ca8dfbd58d29cc (diff) | |
download | troggle-122cdd7fc8620b2348d75b1bb786ae4202db9a55.tar.gz troggle-122cdd7fc8620b2348d75b1bb786ae4202db9a55.tar.bz2 troggle-122cdd7fc8620b2348d75b1bb786ae4202db9a55.zip |
replace GetCaveByReference
Diffstat (limited to 'parsers/logbooks.py')
-rw-r--r-- | parsers/logbooks.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/parsers/logbooks.py b/parsers/logbooks.py index 6a19dad..a724394 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -12,7 +12,7 @@ from django.template.defaultfilters import slugify from django.utils.timezone import get_current_timezone, make_aware from troggle.core.models import DataIssue, Expedition -from troggle.core.models_caves import Cave, OtherCaveName, getCaveByReference, LogbookEntry, PersonTrip +from troggle.core.models_caves import Cave, OtherCaveName, LogbookEntry, PersonTrip from parsers.people import GetPersonExpeditionNameLookup from utils import save_carefully @@ -91,7 +91,10 @@ def GetCaveLookup(): if cave.kataster_number: Gcavelookup[cave.kataster_number] = cave if cave.unofficial_number: - Gcavelookup[cave.unofficial_number] = cave + Gcavelookup[cave.unofficial_number.lower()] = cave + if cave.filename: + # this is the slug - usually.. + Gcavelookup[cave.filename.replace(".html","").lower()] = cave # These are exact matches! edit to check for prefix only! Gcavelookup["tunnocks"] = Gcavelookup["258"] Gcavelookup["hauchhole"] = Gcavelookup["234"] @@ -586,6 +589,7 @@ def parseAutoLogBookEntry(filename): if caveMatch: caveRef, = caveMatch.groups() try: + # this is a slow and uncertain function: cave = getCaveByReference(caveRef) except AssertionError: cave = None |