diff options
Diffstat (limited to 'parsers/survex.py')
| -rw-r--r-- | parsers/survex.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parsers/survex.py b/parsers/survex.py index 6fdf046..19b8466 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -18,7 +18,7 @@ import troggle.core.models_survex as models_survex from troggle.utils import ChaosMonkey from troggle.parsers.people import GetPersonExpeditionNameLookup from troggle.parsers.logbooks import GetCaveLookup -from troggle.core.views_caves import MapLocations +from troggle.core.views.caves import MapLocations survexblockroot = None ROOTBLOCK = "rootblock" @@ -61,7 +61,7 @@ class LoadingSurvex(): rx_teammem = re.compile(r"(?i)"+instruments+"?(?:es|s)?\s+(.*)"+instruments+"?(?:es|s)?$") rx_person = re.compile(r"(?i) and | / |, | & | \+ |^both$|^none$") rx_qm = re.compile(r'(?i)^\s*QM(\d)\s+?([a-dA-DxX])\s+([\w\-]+)\.(\d+)\s+(([\w\-]+)\.(\d+)|\-)\s+(.+)$') -# remember there is also QM_PATTERN used in views_other and set in settings.py +# remember there is also QM_PATTERN used in views.other and set in settings.py rx_tapelng = re.compile(r'(?i).*(tape|length).*$') rx_cave = re.compile(r'(?i)caves-(\d\d\d\d)/([-\d\w]+|\d\d\d\d-?\w+-\d+)') |