Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle

core/TESTS/test_imports.py

@@ -248,7 +248,7 @@ class SubprocessTest(TestCase):
         import troggle.settings as settings
 
         cwd = settings.SURVEX_DATA
-        for survey in ["1623.svx", "1626.svx"]:
+        for survey in ["1623-and-1626-no-schoenberg-hs.svx"]:
             sp = subprocess.run([settings.CAVERN, survey], cwd=cwd, capture_output=True, text=True)
             out = str(sp.stdout)
             if len(out) > 160:

parsers/people.py

@@ -177,6 +177,8 @@ Gpersonexpeditionnamelookup = {}
 
 
 def GetPersonExpeditionNameLookup(expedition):
+    """Yes this should all be in an editable text file, not in the body of the code. Sorry.
+    """
     global Gpersonexpeditionnamelookup
 
     def apply_variations(f, l):
@@ -231,6 +233,16 @@ def GetPersonExpeditionNameLookup(expedition):
             if f == "Rob".lower():
                 possnames += apply_variations("Robert", l)
 
+            if f == "Lizzy".lower():
+                possnames += apply_variations("Lizzie", l)
+            if f == "Lizzie".lower():
+                possnames += apply_variations("Lizzy", l)
+
+            if f == "Phil".lower(): # needed when Phil is used with a surname initial, so default short-form does not work.
+                possnames += apply_variations("Philip", l)
+            if f == "Philip".lower():
+                possnames += apply_variations("Phil", l)
+
             if f == "Andrew".lower():
                 possnames += apply_variations("Andy", l)
             if f == "Andy".lower():
@@ -289,8 +301,11 @@ def GetPersonExpeditionNameLookup(expedition):
                 possnames.append("tinywoman")
                 possnames.append("nadia rc")
                 possnames.append("nadia raeburn-cherradi")
+                
             if f"{f} {l}" == "Phil Wigglesworth".lower():
-                possnames.append("wiggy")
+                possnames.append("wiggy")            
+            if f"{f} {l}" == "Philip Banister".lower():
+                possnames.append("crofton")
             if f"{f} {l}" == "Elaine Oliver".lower():
                 possnames.append("cavingpig")
             if f"{f} {l}" == "Tom Crossley".lower():

parsers/survex.py

@@ -337,7 +337,7 @@ class LoadingSurvex:
     insp = ""
     callcount = 0
     caverncount = 0
-    ignoreprefix = ["surface", "kataster", "fixedpts", "gpx"]
+    ignoreprefix = ["surface", "kataster", "fixedpts", "gpx", "deprecated"]
     ignorenoncave = [
         "caves-1623",
         "caves-1623/2007-NEU",