diff options
| author | Philip Sargent <philip.sargent@klebos.com> | 2022-10-10 00:28:57 +0300 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@klebos.com> | 2022-10-10 00:28:57 +0300 |
| commit | 8c8b6966a7d1e7ee1be5b2e4d8dfefcc3bf32410 (patch) | |
| tree | 986ee77c9616a8ccdaa66c65bfaec90199e576c3 /parsers | |
| parent | 861980a8e9f9d58e6327e8e1a98f7f8c5fec7048 (diff) | |
| download | troggle-8c8b6966a7d1e7ee1be5b2e4d8dfefcc3bf32410.tar.gz troggle-8c8b6966a7d1e7ee1be5b2e4d8dfefcc3bf32410.tar.bz2 troggle-8c8b6966a7d1e7ee1be5b2e4d8dfefcc3bf32410.zip | |
sort output, accept more comma use
Diffstat (limited to 'parsers')
| -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+(.+)$') |