From eec04266120db7564f4d3803922f7df0012d9e52 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Mon, 7 Aug 2023 23:10:30 +0300 Subject: Cope with ARGE people --- parsers/logbooks.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'parsers/logbooks.py') diff --git a/parsers/logbooks.py b/parsers/logbooks.py index 50df6cf..59711c4 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -58,7 +58,7 @@ LOGBOOKS_DIR = "years" # subfolder of settings.EXPOWEB ENTRIES = { "2023": 53, - "2022": 90, + "2022": 93, "2019": 55, "2018": 95, "2017": 74, @@ -128,12 +128,22 @@ def GetTripPersons(trippeople, expedition, logtime_underground, tid=None): tripperson = re.sub(rx_round_bracket, "", tripperson).strip() # 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." + try: + personyear = GetPersonExpeditionNameLookup(expedition).get(tripperson.lower()) + if not personyear: + if known_foreigner(tripperson): + message = f" ! - {expedition.year} Known foreigner: '{tripperson}' in entry {tid=}" + print(message) + else: + message = f" ! - {expedition.year} No name match for: '{tripperson}' in entry {tid=} for this year." + print(message) + DataIssue.objects.create(parser="logbooks", message=message) + res.append((personyear, logtime_underground)) + except: + message = f" ! - {expedition.year} EXCEPTION: '{tripperson}' in entry {tid=} for this year." print(message) DataIssue.objects.create(parser="logbooks", message=message) - res.append((personyear, logtime_underground)) + raise if author_u: author = personyear else: @@ -175,7 +185,7 @@ def tidy_trip_persons(trippeople, title, expedition, logtime_underground, tid): DataIssue.objects.create(parser="logbooks", message=message) print(message) # raise - return + return "", "" if not author: message = f" ! - {expedition.year} Warning: logentry: {title} - no expo member author for entry '{tid}'" -- cgit v1.2.3