expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 16:51:54 +00:00
Code Issues 19 Projects 3 Activity

back to how it was

Browse Source
This commit is contained in:
Philip Sargent 2022-04-27 23:07:02 +03:00
parent b3b10b0db7
commit 362aedc2ac
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/views/expo.py
View File

@ -129,15 +129,14 @@ def expowebpage(request, expowebpath, path):
with open(os.path.normpath(expowebpath / path), "r") as o:
html = o.read()
except:
raise
# try:
# with open(os.path.normpath(expowebpath / path), "rb") as o:
# html = str(o.read()).replace("<h1>","<h1>BAD NON-UTF-8 characters here - ")
# html = html.replace("\\n","\n")
# html = html.replace("\\t","\t")
# html = html.replace("\\'","\'")
# except:
# return HttpResponse(default_head + '<h3>UTF-8 Parsing Failure:<br>Page could not be parsed using UTF-8:<br>failure detected in expowebpage in views.expo.py</h3> Please edit this <var>:expoweb:</var> page to replace dubious umlauts and &pound; symbols with correct HTML entities e.g. <em>&amp;pound;;</em>. </body' )
try:
with open(os.path.normpath(expowebpath / path), "rb") as o:
html = str(o.read()).replace("<h1>","<h1>BAD NON-UTF-8 characters here - ")
html = html.replace("\\n","\n")
html = html.replace("\\t","\t")
html = html.replace("\\'","\'")
except:
return HttpResponse(default_head + '<h3>UTF-8 Parsing Failure:<br>Page could not be parsed using UTF-8:<br>failure detected in expowebpage in views.expo.py</h3> Please edit this <var>:expoweb:</var> page to replace dubious umlauts and &pound; symbols with correct HTML entities e.g. <em>&amp;pound;;</em>. </body' )
m = re.search(r'(.*)<\s*head([^>]*)>(.*)<\s*/head\s*>(.*)<\s*body([^>]*)>(.*)<\s*/body\s*>(.*)', html, re.DOTALL + re.IGNORECASE)
if m: