From e4496e4cd8dd7d6ea809aa2142f2d7adcbeca213 Mon Sep 17 00:00:00 2001
From: goatchurch <devnull@localhost>
Date: Wed, 5 Aug 2009 11:58:36 +0100
Subject: [svn] latest hacking for various statistics

---
 urls.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index b4f2ebc..699c448 100644
--- a/urls.py
+++ b/urls.py
@@ -72,21 +72,24 @@ urlpatterns = patterns('',
     (r'^accounts/', include('registration.urls')),
     (r'^profiles/', include('profiles.urls')),
 
+        
 #   (r'^personform/(.*)$', personForm),
 
     (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
-
+                
         
     url(r'^survexblock/(.+)$',                     views_caves.survexblock, name="survexblock"),
     url(r'^survexfile/(?P<survex_file>.*?)\.svx$', views_survex.svx,        name="svx"),
-    url(r'^survexfile/(?P<survex_file>.*)\.3d$',   views_survex.threed,     name="threed"),
-    url(r'^survexfile/caves$',                     views_survex.survexcaveslist,  name="survexcaveslist"),
+    url(r'^survexfile/(?P<survex_file>.*?)\.3d$',   views_survex.threed,     name="threed"),
+    url(r'^survexfile/(?P<survex_file>.*?)\.log$', views_survex.svxraw),
+    url(r'^survexfile/(?P<survex_file>.*?)\.err$', views_survex.err),
+    
+            
+    url(r'^survexfile/caves/$',                     views_survex.survexcaveslist,  name="survexcaveslist"),
     url(r'^survexfile/caves/(?P<survex_cave>.*)$', views_survex.survexcavesingle, name="survexcavessingle"),
     url(r'^survexfileraw/(?P<survex_file>.*?)\.svx$', views_survex.svxraw,        name="svxraw"),
             
-    (r'^survex/(?P<survex_file>.*)\.log$', log),
-    (r'^survex/(?P<survex_file>.*)\.err$', err),
                 
     (r'^survey_files/listdir/(?P<path>.*)$',       view_surveys.listdir),
     (r'^survey_files/download/(?P<path>.*)$',      view_surveys.download),
@@ -100,5 +103,8 @@ urlpatterns = patterns('',
     (r'^photos/(?P<path>.*)$', 'django.views.static.serve',
         {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}),
 
-    #url(r'^trip_report/?$',views_other.tripreport,name="trip_report")
+    # for those silly ideas
+    url(r'^experimental.*$',                         views_logbooks.experimental,  name="experimental"),
+    
+            #url(r'^trip_report/?$',views_other.tripreport,name="trip_report")
 )
-- 
cgit v1.2.3