diff options
| author | Martin Green <martin.speleo@gmail.com> | 2023-07-13 12:35:00 +0200 |
|---|---|---|
| committer | Martin Green <martin.speleo@gmail.com> | 2023-07-13 12:35:00 +0200 |
| commit | 380fe8cc328abcd077f43b3770f1a28974bb3311 (patch) | |
| tree | d72756f9772a94776250b2752994faca9017ad94 | |
| parent | bdb5e3208bde5d729e2f152ff15a6b2b435d0a7d (diff) | |
| parent | a5968121a002d89de8fe598e284e74dfae04d95b (diff) | |
| download | troggle-380fe8cc328abcd077f43b3770f1a28974bb3311.tar.gz troggle-380fe8cc328abcd077f43b3770f1a28974bb3311.tar.bz2 troggle-380fe8cc328abcd077f43b3770f1a28974bb3311.zip | |
Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle
| -rw-r--r-- | core/TESTS/test_imports.py | 2 | ||||
| -rw-r--r-- | media/SilkRoadsilouetteAndrew.png | bin | 70596 -> 0 bytes | |||
| -rw-r--r-- | parsers/people.py | 17 | ||||
| -rw-r--r-- | parsers/survex.py | 2 |
4 files changed, 18 insertions, 3 deletions
diff --git a/core/TESTS/test_imports.py b/core/TESTS/test_imports.py index 2b23dd4..21601fb 100644 --- a/core/TESTS/test_imports.py +++ b/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: diff --git a/media/SilkRoadsilouetteAndrew.png b/media/SilkRoadsilouetteAndrew.png Binary files differdeleted file mode 100644 index 2ab357a..0000000 --- a/media/SilkRoadsilouetteAndrew.png +++ /dev/null diff --git a/parsers/people.py b/parsers/people.py index 7133384..1f0016a 100644 --- a/parsers/people.py +++ b/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(): diff --git a/parsers/survex.py b/parsers/survex.py index 405771d..b3db9e7 100644 --- a/parsers/survex.py +++ b/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", |
