expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-04-03 01:11:59 +01:00
Code Issues 18 Projects 3 Activity

fixing index.htm as troggle-managed page

Browse Source
This commit is contained in:
Philip Sargent 2024-07-10 13:10:55 +02:00
parent 63ef8c9fb1
commit f5f3adf7da
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/views/expo.py
View File

@ -138,6 +138,7 @@ def pubspage(request):
This is a placeholder, we need to do something like what is done in indexpage() below... This is a placeholder, we need to do something like what is done in indexpage() below...
""" """
expowebpath = Path(settings.EXPOWEB) expowebpath = Path(settings.EXPOWEB)
print("--redirecting from pubspage()")
return expowebpage(request, expowebpath, "pubs.htm") return expowebpage(request, expowebpath, "pubs.htm")
def indexpage(request): def indexpage(request):
@ -146,6 +147,7 @@ def indexpage(request):
This edits the most recent year on the fly.. This edits the most recent year on the fly..
This now works. This now works.
""" """
print("--redirecting from indexpage()")
subpath = Path(settings.EXPOWEB) / "index00.htm" subpath = Path(settings.EXPOWEB) / "index00.htm"
with open(subpath, "r") as o: with open(subpath, "r") as o:
html = o.read() html = o.read()
@ -155,6 +157,9 @@ def indexpage(request):
def expowebpage(request, expowebpath, path): def expowebpage(request, expowebpath, path):
"""Adds menus and serves an HTML page""" """Adds menus and serves an HTML page"""
if path == "" or path == "index.htm":
return indexpage(request)
if not os.path.isfile(expowebpath / path): if not os.path.isfile(expowebpath / path):
# Should not get here if the path has suffix "_edit" # Should not get here if the path has suffix "_edit"
print(f" - 404 error in expowebpage() {path}") print(f" - 404 error in expowebpage() {path}")

1
urls.py
View File

@ -92,6 +92,7 @@ else:
trogglepatterns = [ trogglepatterns = [
path('pubs.htm', pubspage, name="pubspage"), # ~165 hrefs to this url in expoweb files path('pubs.htm', pubspage, name="pubspage"), # ~165 hrefs to this url in expoweb files
#path('', indexpage, name="indexpage"), # ~1,212 hrefs to this url in expoweb files
path('index.htm', indexpage, name="indexpage"), # ~1,212 hrefs to this url in expoweb files path('index.htm', indexpage, name="indexpage"), # ~1,212 hrefs to this url in expoweb files
path('expofiles/', include(expofilesurls)), # intercepted by Apache, if it is running. path('expofiles/', include(expofilesurls)), # intercepted by Apache, if it is running.