summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/urls.py b/urls.py
index 20d2ceb..1f10ecb 100644
--- a/urls.py
+++ b/urls.py
@@ -8,13 +8,14 @@ admin.autodiscover()
urlpatterns = patterns('',
(r'^$', frontPage),
- url(r'^cave/?$', caveindex, name="caveindex"),
+ url(r'^caveindex$', caveindex, name="caveindex"),
+
(r'^cave/(?P<cave_id>[^/]+)/?$', cave),
(r'^cave/(?P<cave_id>[^/]+)/?(?P<ent_letter>[^/])$', ent),
#(r'^cave/(?P<cave_id>[^/]+)/edit/$', edit_cave),
(r'^cavesearch', caveSearch),
- url(r'^survex/(?P<survex_file>.*)\.index$', index, name="survexindex"),
+ url(r'^survex/(.*?)\.index$', index, name="survexindex"),
(r'^survex/(?P<survex_file>.*)\.svx$', svx),
(r'^survex/(?P<survex_file>.*)\.3d$', threed),
(r'^survex/(?P<survex_file>.*)\.log$', log),