Creating forgotten caves & better GetCaveLookup()

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, LogbookEntry, PersonTrip
+from troggle.core.models_caves import Cave, OtherCaveName, LogbookEntry, PersonTrip, GetCaveLookup
 from parsers.people import GetPersonExpeditionNameLookup
 from utils import save_carefully
 
@@ -78,33 +78,6 @@ def GetTripCave(place):
         print(("No cave found for place " , place))
         return None
 
-# lookup function modelled on GetPersonExpeditionNameLookup
-# repeated assignment each call, needs refactoring
-Gcavelookup = None
-def GetCaveLookup():
-    global Gcavelookup
-    if Gcavelookup:
-        return Gcavelookup
-    Gcavelookup = {"NONEPLACEHOLDER":None}
-    for cave in Cave.objects.all():
-        Gcavelookup[cave.official_name.lower()] = cave
-        if cave.kataster_number:
-            Gcavelookup[cave.kataster_number] = cave
-        if cave.unofficial_number:
-            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"]
-    Gcavelookup["KH"] = Gcavelookup["161"]
-    Gcavelookup["Balcony"] = Gcavelookup["264"]
-    Gcavelookup["Balkon"] = Gcavelookup["264"]
-    Gcavelookup["FGH"] = Gcavelookup["290"]
-    Gcavelookup["GSH"] = Gcavelookup["291"]
-    Gcavelookup["Homecoming"] = Gcavelookup["2018-dm-07"]
-    return Gcavelookup
 
 
 logentries = [] # the entire logbook for one year is a single object: a list of entries