From f229ff35f909d7afea62ba2e1021a12cb0e16b22 Mon Sep 17 00:00:00 2001
From: substantialnoninfringinguser <substantialnoninfringinguser@gmail.com>
Date: Wed, 13 May 2009 05:35:59 +0100
Subject: [svn] Julian playing with the logbooks and expoyears Copied from
 http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8180 by julian @
 1/18/2009 3:59 PM

---
 urls.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index 7ef7bd6..ad64d2b 100644
--- a/urls.py
+++ b/urls.py
@@ -21,11 +21,13 @@ urlpatterns = patterns('',
     (r'^survex/(?P<survex_file>.*)\.err$', err),
 
     url(r'^personindex$', personindex, name="personindex"),
-    (r'^person/(?P<person_id>\d*)(?P<first_name>[a-zA-Z]*)[-_/\.\s(\%20)]*(?P<last_name>[a-zA-Z]*)/?$', person),
+    url(r'^person/(.+)$', person, name="person"),
 
-    (r'^logbookentry/(.*)/?$', logbookentry),
+    url(r'^logbookentry/(\d+)$', logbookentry, name="logbookentry"),
     url(r'^logbooksearch/(.*)/?$', logbookSearch),
     
+    url(r'^expedition/(\d+)$', expedition, name="expedition"),
+    
     url(r'^statistics/?$', stats, name="stats"),
     
     (r'^survey/?$', surveyindex),
-- 
cgit v1.2.3