diff options
Diffstat (limited to 'parsers/survex.py')
| -rw-r--r-- | parsers/survex.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/parsers/survex.py b/parsers/survex.py index cbd7704..ee9b5bc 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+(.+)$') |