[svn] Reverted the reverts from 8267. Fixed the next / previous trip in personexpedition on the LogbookEntry template -- I had misunderstood what this was supposed to do last time I messed with it. This involved adding the methods PersonTrip.get_persons_next_trip and persons_previous_trip. Couldn't find any other broken things.

Kept the productive changes in 8267: extending the logbook parsing back to 1993, changing index page, changes to view_surveys.py

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8274 by aaron @ 3/14/2009 8:38 AM

1 files changed, 4 insertions, 5 deletions

diff --git a/urls.py b/urls.py
index 4ab0f0a..64b159d 100644
--- a/urls.py
+++ b/urls.py
@@ -17,12 +17,11 @@ urlpatterns = patterns('',
     

     

     #(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-zA-Z]*[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"),

-    #url(r'^personexpedition/(?P<first_name>[A-Z]*[a-z]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z]*)/(?P<year>\d+)/?$', views_logbooks.personexpedition, name="personexpedition"),

-    url(r'^personexpedition/(.+?)/(\d+)$', views_logbooks.personexpedition, name="personexpedition"),

+    url(r'^personexpedition/(?P<first_name>[A-Z]*[a-z]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z]*)/(?P<year>\d+)/?$', views_logbooks.personexpedition, name="personexpedition"),

     url(r'^logbookentry/(.+)$', views_logbooks.logbookentry,name="logbookentry"),

     

     url(r'^survexblock/(.+)$',  views_caves.survexblock,    name="survexblock"),

@@ -78,5 +77,5 @@ urlpatterns = patterns('',
         {'document_root': settings.SURVEYS, 'show_indexes':True}),

 

     (r'^photos/(?P<path>.*)$', 'django.views.static.serve',

-        {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}),

+        {'document_root': settings.PHOTOS, 'show_indexes':True}),

 )