diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 27 |
1 files changed, 16 insertions, 11 deletions
@@ -34,7 +34,7 @@ The API urls return TSV or JSON and are new in July 2020. if settings.EXPOFILESREMOTE: expofilesurls = [ - url(r'^(?P<path>.*)$', expofiles_redirect, name="expofiles_redirect"), # to expo.survex.com/expofiles + url(r'^(?P<path>.*)$', expofiles_redirect, name="expofiles_redirect"), # to http://expo.survex.com/expofiles ] else: expofilesurls = [ @@ -111,36 +111,41 @@ trogglepatterns = [ # url(r'^map/', .........), # Intercepted by Apache. Yields OpenStreetMap. Redirects to expoweb/map + url(r'^prospecting_guide/$', caves.prospecting), + url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"), + + # The survexfile pages url(r'^survexfile/(?P<survex_file>.*?)\.svx$', survex.svx, name="svx"), url(r'^survexfile/(?P<survex_file>.*?)\.3d$', survex.threed, name="threed"), url(r'^survexfile/(?P<survex_file>.*?)\.log$', survex.svxraw), url(r'^survexfile/(?P<survex_file>.*?)\.err$', survex.err), - url(r'^survexfile/caves/$', survex.survexcaveslist, name="survexcaveslist"), - url(r'^survexfile/(?P<survex_cave>.*)$', survex.survexcavesingle, name="survexcavessingle"), + url(r'^survexfile/caves/$', survex.survexcaveslist, name="survexcaveslist"), + url(r'^survexfile/(?P<survex_cave>.*)$', survex.survexcavesingle, name="survexcavessingle"), url(r'^survey_scans/$', surveys.surveyscansfolders, name="surveyscansfolders"), url(r'^survey_scans/(?P<path>[^/]+)/$', surveys.surveyscansfolder, name="surveyscansfolder"), url(r'^survey_scans/(?P<path>[^/]+)/(?P<file>[^/]+)$', surveys.surveyscansingle, name="surveyscansingle"), + # The tunnel drawings files pages url(r'^tunneldata/$', surveys.tunneldata, name="tunneldata"), url(r'^tunneldataraw/(?P<path>.+?\.xml)$', surveys.tunnelfilesingle, name="tunnelfile"), -# url(r'^tunneldatainfo/(?P<path>.+?\.xml)$', surveys.tunnelfileinfo, name="tunnelfileinfo"), +# url(r'^tunneldatainfo/(?P<path>.+?\.xml)$', surveys.tunnelfileinfo, name="tunnelfileinfo"), # parses tunnel for info url(r'^tunneldataraw/(?P<path>.+?\.xml)/upload$', surveys.tunnelfileupload, name="tunnelfileupload"), - - url(r'^prospecting_guide/$', caves.prospecting), - url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"), - + # This next set are all intercepted by Apache, if it is running. url(r'^photos/(?P<subpath>.*)$', mediapage, {'doc_root': settings.PHOTOS_ROOT}, name="mediapage"), # photo galleries url(r'^site_media/(?P<subpath>.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # MEDIA_ROOT: CSS and JS url(r'^static/(?P<subpath>.*)$', mediapage, {'doc_root': settings.MEDIA_ROOT}, name="mediapage"), # STATIC is in MEDIA now! + url(r'^javascript/(?P<subpath>.*)$', mediapage, {'doc_root': settings.JSLIB_ROOT}, name="mediapage"), # JSLIB_URL + # This next is for shorthand references such as /1623/264 url(r'^(?P<karea>\d\d\d\d)(?P<subpath>.*)$', cavepage, name="cavepage"), # Cave description + # Final catchall which also serves expoweb handbook pages and images url(r'^(.*)_edit$', editexpopage, name="editexpopage"), - url(r'^(.*)$', expopage, name="expopage"), # CATCHALL assumed relative to EXPOWEB + url(r'^(.*)$', expopage, name="expopage"), # CATCHALL assumed relative to EXPOWEB ] # do not allow DIR_ROOT prefix to all urls @@ -151,11 +156,11 @@ urlpatterns = [ # When apache is running these prempt Django so Django never sees them. -# NEW apache configurations suggested as of 20 March 2021: +# NEW apache configurations suggested as of 2 April 2021: # Alias /site-media/ /home/expo/troggle/media/ # Alias /robots.txt /home/expo/troggle/media/robots.txt # Alias /favicon.ico /home/expo/troggle/media/favicon.ico # comes from /expoweb/* when running runserver -# Alias /javascript /home/expo/troggle/media/javascript # empty +# Alias /javascript /home/expo/troggle/media/jslib # empty # Copy of old standard apache configurations: # Alias /expofiles /home/expo/expofiles |