summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:34:33 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:34:33 +0100
commit832f1f53c6f3bd4e1323df728f8fe974df6f5dc4 (patch)
tree322ff22fcfaa020cefb78171e37874437460a72a /urls.py
parenta366161a245339072d55581374df396271cabcac (diff)
downloadtroggle-832f1f53c6f3bd4e1323df728f8fe974df6f5dc4.tar.gz
troggle-832f1f53c6f3bd4e1323df728f8fe974df6f5dc4.tar.bz2
troggle-832f1f53c6f3bd4e1323df728f8fe974df6f5dc4.zip
[svn] Modifications to allow survey files to be pulled from another server. By providing directory listing and download functions,. which could also be used by tunnel
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8172 by julian @ 1/17/2009 11:25 PM
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/urls.py b/urls.py
index fd00e46..7ef7bd6 100644
--- a/urls.py
+++ b/urls.py
@@ -1,5 +1,6 @@
from django.conf.urls.defaults import *
from expo.views import *
+import expo.view_surveys as view_surveys
import troggle.settings as settings
from django.contrib import admin
admin.autodiscover()
@@ -12,7 +13,7 @@ urlpatterns = patterns('',
(r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent),
#(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
(r'^cavesearch', caveSearch),
-
+
(r'^survex/(?P<survex_file>.*)\.index$', index),
(r'^survex/(?P<survex_file>.*)\.svx$', svx),
(r'^survex/(?P<survex_file>.*)\.3d$', threed),
@@ -36,6 +37,10 @@ urlpatterns = patterns('',
(r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+ (r'^survey_files/listdir/(?P<path>.*)$', view_surveys.listdir),
+ (r'^survey_files/download/(?P<path>.*)$', view_surveys.download),
+ #(r'^survey_files/upload/(?P<path>.*)$', view_surveys.upload),
+
(r'^survey_scans/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.SURVEYS, 'show_indexes':True}),