From e9790e70d64c3e63336aac53eee0fcd22b30f407 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sat, 8 Oct 2022 01:52:10 +0300 Subject: abbrv. names now accepted when parsing logbooks, survex --- parsers/survex.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'parsers/survex.py') diff --git a/parsers/survex.py b/parsers/survex.py index 1782994..cbd7704 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -126,7 +126,7 @@ class LoadingSurvex(): rx_teammem = re.compile(r"(?i)"+instruments+"?(?:es|s)?\s+(.*)$") rx_teamold = re.compile(r"(?i)(.*)\s+"+instruments+"?(?:es|s)?$") rx_teamabs = re.compile(r"(?i)^\s*("+instruments+")?(?:es|s)?\s*$") - rx_person = re.compile(r"(?i) and | / |, | & | \+ |^both$|^none$") + rx_person = re.compile(r"(?i) and |/| / |, | & | \+ |^both$|^none$") rx_qm = re.compile(r'(?i)^\s*QM(\d+)\s+?([a-dA-DxX])\s+([\w\-\_]+)\.([\w\.\-]+)\s+(([\w\-]+)\.([\w\.\-]+)|\-)\s+(.+)$') # does not recognise non numeric suffix survey point ids rx_qm0 = re.compile(r'(?i)^\s*QM(\d+)\s+(.+)$') @@ -374,11 +374,11 @@ class LoadingSurvex(): # print(self.insp+message) # DataIssue.objects.create(parser='survex', message=message) pr.personexpedition = pe - pr.person = p.personexpedition.person + pr.person = pr.personexpedition.person pr.save() self.currentpersonexped.append(pe) # used in push/pop block code else: - message = "! *team {} '{}' FAIL personexpedition lookup on *date {} ({}) '{}'".format(year, p, survexblock.survexfile.path, survexblock, p.personname) + message = "! *team {} '{}' FAIL personexpedition lookup on *date {} ({}) '{}'".format(year, pr, survexblock.survexfile.path, survexblock, pr.personname) print(self.insp+message) DataIssue.objects.create(parser='survex', message=message, url=get_offending_filename(survexblock.survexfile.path)) -- cgit v1.2.3