expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-16 09:27:09 +00:00
Code Issues 18 Projects 3 Activity

moer people/logbook improvements

Browse Source
This commit is contained in:
Philip Sargent
2023-09-05 14:35:56 +03:00
parent f3d5a389eb
commit 0ea8fadaeb
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
parsers/logbooks.py
View File

@@ -130,7 +130,7 @@ def reset_trip_id(date):
# print(already, n, tid)
return tid
rx_tripperson = re.compile(r"(?i)<u>(.*?)</u>$")
rx_tripauthor = re.compile(r"(?i)<u>(.*?)</u>$")
rx_round_bracket = re.compile(r"[\(\[].*?[\)\]]")
def GetTripPersons(trippeople, expedition, logtime_underground, tid=None):
@@ -143,11 +143,14 @@ def GetTripPersons(trippeople, expedition, logtime_underground, tid=None):
for tripperson in re.split(r",|\+|&amp;|&(?!\w+;)| and ", trippeople):
tripperson = tripperson.strip()
# author_u = re.match(r"(?i)<u>(.*?)</u>$", tripperson)
author_u = rx_tripperson.match(tripperson)
author_u = rx_tripauthor.match(tripperson)
if author_u:
tripperson = author_u.group(1).strip()
if tripperson:
if tripperson[0] != "*": # a name prefix of "*" is special
if tripperson[0] == "*": # a name prefix of "*" is special
guests.append(tripperson)
# print(f" ! - {expedition.year} * GUEST : {tripperson}")
else:
tripperson = re.sub(rx_round_bracket, "", tripperson).strip()
# Whacky aliases all resolved in GetPersonExpeditionNameLookup()
@@ -172,16 +175,12 @@ def GetTripPersons(trippeople, expedition, logtime_underground, tid=None):
raise
if author_u:
author = personyear
else: # *guest
guests.append(tripperson)
# print(f" ! - {expedition.year} * GUEST : {tripperson}")
if not author:
if not res:
return "", 0, ""
author = res[-1][0] # the previous valid person and a time of 0 hours
# print(f" - {tid} [{author.person}] '{res[0][0].person}'...")
author = res[-1][0] # the last valid person and a time of 0 hours. BODGE. This gets written into the archive file as Truth.
return res, author, guests
def tidy_time_underground(logtime_underground):