diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2019-02-25 20:13:28 +0000 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2019-02-25 20:13:28 +0000 |
| commit | bebbad24480f564a8c269f8e73dbeaef1747f080 (patch) | |
| tree | bf0883e76298a5d3b54484112e3c1c5ce89a60c9 /core | |
| parent | b43bd58f22bfbec17b3e935b97fd14b2392a3962 (diff) | |
| download | troggle-bebbad24480f564a8c269f8e73dbeaef1747f080.tar.gz troggle-bebbad24480f564a8c269f8e73dbeaef1747f080.tar.bz2 troggle-bebbad24480f564a8c269f8e73dbeaef1747f080.zip | |
Fix the All Survex page to work with 1623 area
Diffstat (limited to 'core')
| -rw-r--r-- | core/views_survex.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/views_survex.py b/core/views_survex.py index e252095..9fc334a 100644 --- a/core/views_survex.py +++ b/core/views_survex.py @@ -84,9 +84,9 @@ class SvxForm(forms.Form): fname = settings.SURVEX_DATA + self.data['filename'] + ".svx" if not os.path.isfile(fname): # only save if appears valid - if re.search("\[|\]", rcode): + if re.search(r"\[|\]", rcode): return "Error: clean up all []s from the text" - mbeginend = re.search("(?s)\*begin\s+(\w+).*?\*end\s+(\w+)", rcode) + mbeginend = re.search(r"(?s)\*begin\s+(\w+).*?\*end\s+(\w+)", rcode) if not mbeginend: return "Error: no begin/end block here" if mbeginend.group(1) != mbeginend.group(2): @@ -280,7 +280,7 @@ def survexcaveslist(request): survdirobj = [ ] for lsubsvx in subsvx: - survdirobj.append(("caves/"+cavedir+"/"+lsubsvx, lsubsvx)) + survdirobj.append(("caves-1623/"+cavedir+"/"+lsubsvx, lsubsvx)) # caves with subdirectories if subdirs: @@ -290,7 +290,7 @@ def survexcaveslist(request): assert not dsubdirs lsurvdirobj = [ ] for lsubsvx in dsubsvx: - lsurvdirobj.append(("caves/"+cavedir+"/"+subdir+"/"+lsubsvx, lsubsvx)) + lsurvdirobj.append(("caves-1623/"+cavedir+"/"+subdir+"/"+lsubsvx, lsubsvx)) subsurvdirs.append((lsurvdirobj[0], lsurvdirobj[1:])) subdircaves.append((cavedir, (survdirobj[0], survdirobj[1:]), subsurvdirs)) |