From 7cccf4daf15f16f3b7b4dc7909862fc2839caf4f Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Wed, 31 Mar 2021 21:51:17 +0100 Subject: move *_views files to /views/* --- urls.py | 137 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 69 insertions(+), 68 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 79651c3..46e06b1 100644 --- a/urls.py +++ b/urls.py @@ -6,11 +6,12 @@ from django.views.generic.list import ListView from django.contrib import admin from django.urls import reverse, resolve -from troggle.core import views_other, views_caves, views_logbooks, views_statistics, views_survex, view_surveys -from troggle.core.views_other import troggle404 -from troggle.core.views_caves import ent, prospecting_image -from troggle.core.views_statistics import pathsreport, stats -from troggle.core.views_expo import expofiles_redirect, expofilessingle, expopage, editexpopage +from troggle.core.views import surveys, logbooks, other, caves, statistics, survex +from troggle.core.views.other import troggle404, frontpage +from troggle.core.views.caves import ent, prospecting_image +from troggle.core.views.statistics import pathsreport, stats +from troggle.core.views.expo import expofiles_redirect, expofilessingle, expopage, editexpopage +from troggle.core.views.survex import survexcaveslist, survexcavesingle, svx """This sets the actualurlpatterns[] and urlpatterns[] lists which django uses to resolve urls - in both directions as these are declarative. @@ -25,7 +26,7 @@ which is vital to writing code for the webapp. So the URL dispatch is declarativ The API urls return TSV or JSON and are new in July 2020. """ -#handler404 = 'troggle.core.views_other.troggle404' # can't get this to work. but 404.html is default anyway +#handler404 = 'troggle.core.views.other.troggle404' # can't get this to work. but 404.html is default anyway # Many of these patterns do not work because troggle spent many years broken and we have # not yet restored all the functions. Some may have never been fully implemented in @@ -44,10 +45,10 @@ else: trogglepatterns = [ url(r'^expofiles/', include(expofilesurls)), - url(r'^troggle$', views_other.frontpage, name="frontpage"), # control panel. Shows recent actions. - url(r'^caves$', views_caves.caveindex, name="caveindex"), - url(r'^indxal.htm$', views_caves.caveindex, name="caveindex"), # ~420 hrefs to this url in expoweb files - url(r'^people/?$', views_logbooks.personindex, name="personindex"), + url(r'^troggle$', other.frontpage, name="frontpage"), # control panel. Shows recent actions. + url(r'^caves$', caves.caveindex, name="caveindex"), + url(r'^indxal.htm$', caves.caveindex, name="caveindex"), # ~420 hrefs to this url in expoweb files + url(r'^people/?$', logbooks.personindex, name="personindex"), url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # needs docutils Python module (http://docutils.sf.net/). url(r'^admin/', admin.site.urls), @@ -58,82 +59,82 @@ trogglepatterns = [ url(r'^accounts/', include('django.contrib.auth.urls')), # from Dj3.0, see site-packages\registration\auth_urls_classes.py - url(r'^newqmnumber/?$', views_other.ajax_QM_number, ), + url(r'^newqmnumber/?$', other.ajax_QM_number, ), # url(r'^lbo_suggestions/?$', logbook_entry_suggestions), #broken, removed. -# url(r'^person/(?P\d*)/?$', views_logbooks.person), - url(r'^person/(?P[A-Z]*[a-z\-\'&;]*)[^a-zA-Z]*(?P[a-z\-\']*[^a-zA-Z]*[A-Z]*[a-z\-&;]*)/?', views_logbooks.person, name="person"), -# url(r'^person/(\w+_\w+)$', views_logbooks.person, name="person"), +# url(r'^person/(?P\d*)/?$', logbooks.person), + url(r'^person/(?P[A-Z]*[a-z\-\'&;]*)[^a-zA-Z]*(?P[a-z\-\']*[^a-zA-Z]*[A-Z]*[a-z\-&;]*)/?', logbooks.person, name="person"), +# url(r'^person/(\w+_\w+)$', logbooks.person, name="person"), # url(r'^personform/(.*)$', personForm), - url(r'^expedition/(\d+)$', views_logbooks.expedition, name="expedition"), - url(r'^api/expeditions_tsv$', views_logbooks.Expeditions_tsvListView.as_view()), - url(r'^api/expeditions_json$', views_logbooks.Expeditions_jsonListView.as_view()), - url(r'^personexpedition/(?P[A-Z]*[a-z&;]*)[^a-zA-Z]*(?P[A-Z]*[a-zA-Z&;]*)/(?P\d+)/?$', views_logbooks.personexpedition, name="personexpedition"), - url(r'^logbookentry/(?P.*)/(?P.*)/?$', views_logbooks.logbookentry,name="logbookentry"), -# url(r'^newlogbookentry/(?P.*)$', views_logbooks.newLogbookEntry, name="newLogBookEntry"), # Needed ! -# url(r'^editlogbookentry/(?P[^/]*)/(?P[^/]*)/(?P[^/]*)/$', views_logbooks.newLogbookEntry, name="editLogBookEntry"), # working ! -# url(r'^deletelogbookentry/(?P[^/]*)/(?P[^/]*)/(?P[^/]*)/$', views_logbooks.deleteLogbookEntry, name="deleteLogBookEntry"), - url(r'^newfile', views_other.newFile, name="newFile"), # oddly broken, needs investigating more - - url(r'^getEntrances/(?P.*)', views_caves.get_entrances, name = "get_entrances"), #works + url(r'^expedition/(\d+)$', logbooks.expedition, name="expedition"), + url(r'^api/expeditions_tsv$', logbooks.Expeditions_tsvListView.as_view()), + url(r'^api/expeditions_json$', logbooks.Expeditions_jsonListView.as_view()), + url(r'^personexpedition/(?P[A-Z]*[a-z&;]*)[^a-zA-Z]*(?P[A-Z]*[a-zA-Z&;]*)/(?P\d+)/?$', logbooks.personexpedition, name="personexpedition"), + url(r'^logbookentry/(?P.*)/(?P.*)/?$', logbooks.logbookentry,name="logbookentry"), +# url(r'^newlogbookentry/(?P.*)$', logbooks.newLogbookEntry, name="newLogBookEntry"), # Needed ! +# url(r'^editlogbookentry/(?P[^/]*)/(?P[^/]*)/(?P[^/]*)/$', logbooks.newLogbookEntry, name="editLogBookEntry"), # working ! +# url(r'^deletelogbookentry/(?P[^/]*)/(?P[^/]*)/(?P[^/]*)/$', logbooks.deleteLogbookEntry, name="deleteLogBookEntry"), + url(r'^newfile', other.newFile, name="newFile"), # oddly broken, needs investigating more + + url(r'^getEntrances/(?P.*)', caves.get_entrances, name = "get_entrances"), #works # e.g. /getEntrances/1623-161 - url(r'^getQMs/(?P.*)', views_caves.get_qms, name = "get_qms"), # no template "get_qms"? - url(r'^getPeople/(?P.*)', views_logbooks.get_people, name = "get_people"), # fails - url(r'^getLogBookEntries/(?P.*)', views_logbooks.get_logbook_entries, name = "get_logbook_entries"), #works + url(r'^getQMs/(?P.*)', caves.get_qms, name = "get_qms"), # no template "get_qms"? + url(r'^getPeople/(?P.*)', logbooks.get_people, name = "get_people"), # fails + url(r'^getLogBookEntries/(?P.*)', logbooks.get_logbook_entries, name = "get_logbook_entries"), #works - url(r'^cave/new/$', views_caves.edit_cave, name="newcave"), - url(r'^cave/(?P[^/]+)/?$', views_caves.cave, name="cave"), + url(r'^cave/new/$', caves.edit_cave, name="newcave"), + url(r'^cave/(?P[^/]+)/?$', caves.cave, name="cave"), url(r'^cave/(?P[^/]+)/?(?P[^/])$', ent), # view_caves.ent - url(r'^cave/(?P[^/]+)/edit/$', views_caves.edit_cave, name="edit_cave"), - url(r'^cave/(?P[^/]+)/(?P\d\d\d\d)-(?P\d*)(?P[ABCDX]?)?$', views_caves.qm, name="qm"), - - url(r'^caveslug/([^/]+)/?$', views_caves.caveSlug, name="caveSlug"), - url(r'^cave/entrance/([^/]+)/?$', views_caves.caveEntrance), - url(r'^cave/description/([^/]+)/?$', views_caves.caveDescription), - url(r'^cave/qms/([^/]+)/?$', views_caves.caveQMs), # blank page - url(r'^cave/logbook/([^/]+)/?$', views_caves.caveLogbook), - url(r'^cave/3d/(?P[^/]+).3d$', views_caves.cave3d, name="cave3d"), - - url(r'^entrance/(?P[^/]+)/(?P[^/]+)/edit/', views_caves.editEntrance, name = "editentrance"), - url(r'^entrance/new/(?P[^/]+)/', views_caves.editEntrance, name = "newentrance"), + url(r'^cave/(?P[^/]+)/edit/$', caves.edit_cave, name="edit_cave"), + url(r'^cave/(?P[^/]+)/(?P\d\d\d\d)-(?P\d*)(?P[ABCDX]?)?$', caves.qm, name="qm"), + + url(r'^caveslug/([^/]+)/?$', caves.caveSlug, name="caveSlug"), + url(r'^cave/entrance/([^/]+)/?$', caves.caveEntrance), + url(r'^cave/description/([^/]+)/?$', caves.caveDescription), + url(r'^cave/qms/([^/]+)/?$', caves.caveQMs), # blank page + url(r'^cave/logbook/([^/]+)/?$', caves.caveLogbook), + url(r'^cave/3d/(?P[^/]+).3d$', caves.cave3d, name="cave3d"), + + url(r'^entrance/(?P[^/]+)/(?P[^/]+)/edit/', caves.editEntrance, name = "editentrance"), + url(r'^entrance/new/(?P[^/]+)/', caves.editEntrance, name = "newentrance"), - url(r'^prospecting_guide/$', views_caves.prospecting), - url(r'^logbooksearch/(.*)/?$', views_logbooks.logbookSearch), + url(r'^prospecting_guide/$', caves.prospecting), + url(r'^logbooksearch/(.*)/?$', logbooks.logbookSearch), - url(r'^statistics/?$', views_statistics.stats, name="stats"), - url(r'^stats/?$', views_statistics.stats, name="stats"), - url(r'^pathsreport.*$', views_statistics.pathsreport, name="pathsreport"), + url(r'^statistics/?$', statistics.stats, name="stats"), + url(r'^stats/?$', statistics.stats, name="stats"), + url(r'^pathsreport.*$', statistics.pathsreport, name="pathsreport"), - url(r'^controlpanel/?$', views_other.controlPanel, name="controlpanel"), - url(r'^logbook(?P\d\d\d\d)\.(?P.*)/?$',views_other.downloadLogbook), - url(r'^logbook/?$',views_other.downloadLogbook, name="downloadlogbook"), - url(r'^cave/(?P[^/]+)/qm\.csv/?$', views_other.downloadQMs, name="downloadqms"), - url(r'^downloadqms$', views_other.downloadQMs), + url(r'^controlpanel/?$', other.controlPanel, name="controlpanel"), + url(r'^logbook(?P\d\d\d\d)\.(?P.*)/?$', other.downloadLogbook), + url(r'^logbook/?$', other.downloadLogbook, name="downloadlogbook"), + url(r'^cave/(?P[^/]+)/qm\.csv/?$', other.downloadQMs, name="downloadqms"), + url(r'^downloadqms$', other.downloadQMs), # url(r'^map/', .........), # Intercepted by Apache. Yields OpenStreetMap. Redirects to expoweb/map - url(r'^survexfile/(?P.*?)\.svx$', views_survex.svx, name="svx"), - url(r'^survexfile/(?P.*?)\.3d$', views_survex.threed, name="threed"), - url(r'^survexfile/(?P.*?)\.log$', views_survex.svxraw), - url(r'^survexfile/(?P.*?)\.err$', views_survex.err), + url(r'^survexfile/(?P.*?)\.svx$', survex.svx, name="svx"), + url(r'^survexfile/(?P.*?)\.3d$', survex.threed, name="threed"), + url(r'^survexfile/(?P.*?)\.log$', survex.svxraw), + url(r'^survexfile/(?P.*?)\.err$', survex.err), - url(r'^survexfile/caves/$', views_survex.survexcaveslist, name="survexcaveslist"), - url(r'^survexfile/(?P.*)$', views_survex.survexcavesingle, name="survexcavessingle"), + url(r'^survexfile/caves/$', survex.survexcaveslist, name="survexcaveslist"), + url(r'^survexfile/(?P.*)$', survex.survexcavesingle, name="survexcavessingle"), - url(r'^survey_scans/$', view_surveys.surveyscansfolders, name="surveyscansfolders"), - url(r'^survey_scans/(?P[^/]+)/$', view_surveys.surveyscansfolder, name="surveyscansfolder"), + url(r'^survey_scans/$', surveys.surveyscansfolders, name="surveyscansfolders"), + url(r'^survey_scans/(?P[^/]+)/$', surveys.surveyscansfolder, name="surveyscansfolder"), url(r'^survey_scans/(?P[^/]+)/(?P[^/]+)$', - view_surveys.surveyscansingle, name="surveyscansingle"), + surveys.surveyscansingle, name="surveyscansingle"), - url(r'^tunneldata/$', view_surveys.tunneldata, name="tunneldata"), - url(r'^tunneldataraw/(?P.+?\.xml)$', view_surveys.tunnelfilesingle, name="tunnelfile"), -# url(r'^tunneldatainfo/(?P.+?\.xml)$', view_surveys.tunnelfileinfo, name="tunnelfileinfo"), - url(r'^tunneldataraw/(?P.+?\.xml)/upload$', view_surveys.tunnelfileupload, name="tunnelfileupload"), + url(r'^tunneldata/$', surveys.tunneldata, name="tunneldata"), + url(r'^tunneldataraw/(?P.+?\.xml)$', surveys.tunnelfilesingle, name="tunnelfile"), +# url(r'^tunneldatainfo/(?P.+?\.xml)$', surveys.tunnelfileinfo, name="tunnelfileinfo"), + url(r'^tunneldataraw/(?P.+?\.xml)/upload$', surveys.tunnelfileupload, name="tunnelfileupload"), url(r'^prospecting/(?P[^.]+).png$', prospecting_image, name="prospecting_image"), -# url(r'^javascript/(?P.*)$', view_surveys.expofilessingle, name="single"), # JSLIB_URL - Apache: Alias /javascript /usr/share/javascript +# url(r'^javascript/(?P.*)$', surveys.expofilessingle, name="single"), # JSLIB_URL - Apache: Alias /javascript /usr/share/javascript # static views not working, removed as a plugin. Use apache instead to serve these: # url(r'^photos/(?P.*)$', staticviews.serve, @@ -141,10 +142,10 @@ trogglepatterns = [ # url(r'^gallery/(?P.*)$', staticviews.serve, # {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}), -# url(r'^site_media/(?P.*)$', view_surveys.expofilessingle, name="single"), # MEDIA_ROOT: CSS and JS +# url(r'^site_media/(?P.*)$', surveys.expofilessingle, name="single"), # MEDIA_ROOT: CSS and JS url(r'^(site_media/.*)$', expopage, name="expopage"), # MEDIA_ROOT: CSS and JS -# url(r'^static/(?P.*)$', view_surveys.expofilessingle, name="single"), # MEDIA_ROOT: CSS and JS +# url(r'^static/(?P.*)$', surveys.expofilessingle, name="single"), # MEDIA_ROOT: CSS and JS url(r'^(static/.*)$', expopage, name="expopage"), # STATIC: CSS and JS url(r'^(.*)_edit$', editexpopage, name="editexpopage"), -- cgit v1.2.3