From 8916b460e1b915d1a3aa32b3691da67b753f652b Mon Sep 17 00:00:00 2001
From: substantialnoninfringinguser <substantialnoninfringinguser@gmail.com>
Date: Wed, 13 May 2009 05:55:00 +0100
Subject: [svn] Copied from
 http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8255 by aaron @
 2/23/2009 4:16 AM

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

(limited to 'urls.py')

diff --git a/urls.py b/urls.py
index a701ba1..6c54916 100644
--- a/urls.py
+++ b/urls.py
@@ -12,12 +12,12 @@ urlpatterns = patterns('',
     
     url(r'^$',              views_other.frontpage,      name="frontpage"),
     
-    url(r'^caveindex$',     views_caves.caveindex,      name="caveindex"),
+    url(r'^caveindex/?$',     views_caves.caveindex,      name="caveindex"),
     url(r'^personindex$',   views_logbooks.personindex, name="personindex"),
     
     
     #(r'^person/(?P<person_id>\d*)/?$', views_logbooks.person),
-    url(r'^person/(?P<first_name>[A-Z]*[a-z]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z]*)/?', views_logbooks.person, name="person"),
+    url(r'^person/(?P<first_name>[A-Z]*[a-z\-\']*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z\-]*)/?', views_logbooks.person, name="person"),
     #url(r'^person/(\w+_\w+)$',       views_logbooks.person,      name="person"),
     
     url(r'^expedition/(\d+)$',  views_logbooks.expedition,  name="expedition"),
-- 
cgit v1.2.3