From 735b729a414fdda2e4b832c58707decb19aaae6c Mon Sep 17 00:00:00 2001 From: goatchurch Date: Thu, 10 Sep 2009 22:07:31 +0100 Subject: survey scans features added --- urls.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index e653649..c3b4be7 100644 --- a/urls.py +++ b/urls.py @@ -12,6 +12,9 @@ from django.views.generic.list_detail import object_list from django.contrib import admin admin.autodiscover() + +# type url probably means it's used. + urlpatterns = patterns('', url(r'^$', views_other.frontpage, name="frontpage"), @@ -86,14 +89,14 @@ urlpatterns = patterns('', url(r'^survexblock/(.+)$', views_caves.survexblock, name="survexblock"), url(r'^survexfile/(?P.*?)\.svx$', views_survex.svx, name="svx"), - url(r'^survexfile/(?P.*?)\.3d$', views_survex.threed, name="threed"), + 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/caves/$', views_survex.survexcaveslist, name="survexcaveslist"), - url(r'^survexfile/caves/(?P.*)$', views_survex.survexcavesingle, name="survexcavessingle"), - url(r'^survexfileraw/(?P.*?)\.svx$', views_survex.svxraw, name="svxraw"), + url(r'^survexfile/caves/(?P.*)$', views_survex.survexcavesingle, name="survexcavessingle"), + url(r'^survexfileraw/(?P.*?)\.svx$', views_survex.svxraw, name="svxraw"), (r'^survey_files/listdir/(?P.*)$', view_surveys.listdir), @@ -102,8 +105,11 @@ urlpatterns = patterns('', - (r'^survey_scans/(?P.*)$', 'django.views.static.serve', - {'document_root': settings.SURVEY_SCANS, 'show_indexes':True}), + #(r'^survey_scans/(?P.*)$', 'django.views.static.serve', {'document_root': settings.SURVEY_SCANS, 'show_indexes':True}), + url(r'^survey_scans/$', view_surveys.surveyscansfolders, name="surveyscansfolders"), + url(r'^survey_scans/(?P[^/]+)/$', view_surveys.surveyscansfolder, name="surveyscansfolder"), + url(r'^survey_scans/(?P[^/]+)/(?P[^/]+(?:png|jpg))$', + view_surveys.surveyscansingle, name="surveyscansingle"), (r'^photos/(?P.*)$', 'django.views.static.serve', {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}), -- cgit v1.2.3