diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -7,7 +7,8 @@ from django.contrib import admin from django.contrib import auth from django.urls import reverse, resolve -from troggle.core.views import surveys, other, caves, statistics, survex +from troggle.core.views import other, caves, statistics, survex +from troggle.core.views.surveys import surveyscansingle, surveyscansfolder, surveyscansfolders, dwgdata, dwgfilesingle, dwgfileupload from troggle.core.views.other import troggle404, frontpage from troggle.core.views.caves import ent, cavepage from troggle.core.views.logbooks import get_logbook_entries, logbookentry, logbookSearch @@ -135,18 +136,18 @@ trogglepatterns = [ re_path(r'^survexfile/caves$', survex.survexcaveslist, name="survexcaveslist"), # auto slash not working re_path(r'^survexfile/(?P<survex_cave>.*)$', survex.survexcavesingle, name="survexcavessingle"), - re_path(r'^survey_scans/$', surveys.surveyscansfolders, name="surveyscansfolders"), - re_path(r'^survey_scans/(?P<path>[^/]+)/$', surveys.surveyscansfolder, name="surveyscansfolder"), + re_path(r'^survey_scans/$', surveyscansfolders, name="surveyscansfolders"), + re_path(r'^survey_scans/(?P<path>[^/]+)/$', surveyscansfolder, name="surveyscansfolder"), re_path(r'^survey_scans/(?P<path>[^/]+)/(?P<file>[^/]+)$', - surveys.surveyscansingle, name="surveyscansingle"), + surveyscansingle, name="surveyscansingle"), # The tunnel and therion drawings files pages - re_path(r'^tunneldata/$', surveys.tunneldata, name="tunneldata"), - re_path(r'^tunneldataraw/(?P<path>.+?\.xml)$', surveys.dwgfilesingle, name="dwgfilesingle"), - re_path(r'^tunneldataraw/(?P<path>.+?\.th)$', surveys.dwgfilesingle, name="dwgfilesingle"), - re_path(r'^tunneldataraw/(?P<path>.+?\.th2)$', surveys.dwgfilesingle, name="dwgfilesingle"), -# re_path(r'^tunneldatainfo/(?P<path>.+?\.xml)$', surveys.tunnelfileinfo, name="tunnelfileinfo"), # parses tunnel for info - re_path(r'^tunneldataraw/(?P<path>.+?\.xml)/upload$', surveys.tunnelfileupload, name="tunnelfileupload"), + re_path(r'^dwgdata/$', dwgdata, name="dwgdata"), + re_path(r'^dwgdataraw/(?P<path>.+?\.xml)$', dwgfilesingle, name="dwgfilesingle"), + re_path(r'^dwgdataraw/(?P<path>.+?\.th)$', dwgfilesingle, name="dwgfilesingle"), + re_path(r'^dwgdataraw/(?P<path>.+?\.th2)$', dwgfilesingle, name="dwgfilesingle"), +# re_path(r'^dwgdatainfo/(?P<path>.+?\.xml)$', dwgfileinfo, name="dwgfileinfo"), # parses tunnel for info + re_path(r'^dwgdataraw/(?P<path>.+?\.xml)/upload$', dwgfileupload, name="dwgfileupload"), # Not working # QMs pages - must precede other /caves pages |