2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-15 01:17:14 +00:00

moved aliases to people module, faster db too

This commit is contained in:
2023-01-28 14:03:46 +00:00
parent 9e71be8169
commit d9a4069662
2 changed files with 21 additions and 30 deletions

View File

@@ -125,24 +125,7 @@ def GetTripPersons(trippeople, expedition, logtime_underground, tid=None):
if tripperson and tripperson[0] != "*":
tripperson = re.sub(rx_round_bracket, "", tripperson).strip()
# these aliases should be moved to people.py GetPersonExpeditionNameLookup(expedition)
if tripperson == "Wiggy":
tripperson = "Phil Wigglesworth"
if tripperson == "Animal":
tripperson = "Mike Richardson"
if tripperson == "MikeTA":
tripperson = "Mike Richardson"
if tripperson == "CavingPig":
tripperson = "Elaine Oliver"
if tripperson == "nobrotson":
tripperson = "Rob Watson"
if tripperson == "Tinywoman":
tripperson = "Nadia"
if tripperson == "tcacrossley":
tripperson = "Tom Crossley"
if tripperson == "Samouse1":
tripperson = "Todd Rye"
# Whacky aliases all handled in GetPersonExpeditionNameLookup()
personyear = GetPersonExpeditionNameLookup(expedition).get(tripperson.lower())
if not personyear:
message = f" ! - {expedition.year} No name match for: '{tripperson}' in entry {tid=} for this expedition year."