expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-02-17 20:50:13 +00:00
Code Issues 18 Projects 3 Activity

NOEDIT fixed

Browse Source
This commit is contained in:
Philip Sargent 2023-08-02 13:41:12 +03:00
parent 585eb534a9
commit 6bca75b877
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/views/expo.py
View File

@ -179,12 +179,11 @@ def expowebpage(request, expowebpath, path):
(title,) = m.groups() (title,) = m.groups()
else: else:
title = "" title = ""
m = re.search(r"^<meta([^>]*)noedit", head, re.DOTALL + re.IGNORECASE) m = re.search(r"noedit", head, re.DOTALL + re.IGNORECASE)
if m: if m:
editable = False editable = False
else: else:
editable = os.access(expowebpath / path, os.W_OK) # are file permissions writeable? editable = os.access(expowebpath / path, os.W_OK) # are file permissions writeable?
has_menu = False has_menu = False
menumatch = re.match(r'(.*)<ul id="links">', body, re.DOTALL + re.IGNORECASE) menumatch = re.match(r'(.*)<ul id="links">', body, re.DOTALL + re.IGNORECASE)
if menumatch: if menumatch:

8
parsers/survex.py
View File

@ -972,7 +972,10 @@ class LoadingSurvex:
survexleg = None survexleg = None
def LoadSurvexRef(self, survexblock, args): def LoadSurvexRef(self, survexblock, args):
"""Interpret the *ref record, and all the many variants""" """Interpret the *ref record, and all the many variants
the 'letter' was X for electronic wallets but we no longer do this. So the code
that handles 'letter' can be removed.
"""
# print(self.insp+ "*REF ---- '"+ args +"'") # print(self.insp+ "*REF ---- '"+ args +"'")
url = get_offending_filename(survexblock.survexfile.path) url = get_offending_filename(survexblock.survexfile.path)
# *REF but also ; Ref years from 1960 to 2039 # *REF but also ; Ref years from 1960 to 2039
@ -1002,6 +1005,9 @@ class LoadingSurvex:
letterx = "" letterx = ""
else: else:
letterx = "X" letterx = "X"
message = f" ! Wallet *REF has LETTER in '{survexblock.survexfile.path}' malformed id '{args}' {perps}"
print(self.insp + message)
stash_data_issue(parser="survex", message=message, url=url)
if len(wallet) < 2: if len(wallet) < 2:
wallet = "0" + wallet wallet = "0" + wallet
if not (int(yr) > 1960 and int(yr) < 2050): if not (int(yr) > 1960 and int(yr) < 2050):