1 files changed, 7 insertions, 3 deletions
diff --git a/expo/views_logbooks.py b/expo/views_logbooks.py
index b44c770..ac1954a 100644
--- a/expo/views_logbooks.py
+++ b/expo/views_logbooks.py
@@ -2,13 +2,17 @@ from django.shortcuts import render_to_response
 from troggle.expo.models import Expedition, Person, PersonExpedition, PersonTrip, LogbookEntry
 import troggle.settings as settings
 import search
+import re
 
 def personindex(request):
     persons = Person.objects.all()
     return render_to_response('personindex.html', {'persons': persons, 'settings': settings})
 
-def person(request, person_id):
-    person = Person.objects.filter(id = person_id)[0]
+def person(request, person_id, first_name, last_name):
+    if first_name == '' or last_name == '':
+        person = Person.objects.filter(id = person_id)[0]
+    else:
+        person = Person.objects.filter(first_name = first_name, last_name = last_name)[0]
     return render_to_response('person.html', {'person': person, 'settings': settings})
 
 def logbookentry(request, logbookentry_id):
@@ -25,4 +29,4 @@ def logbookSearch(request, extra):
 
     return render_to_response('logbooksearch.html',
                           { 'query_string': query_string, 'found_entries': found_entries, 'settings': settings})
-                          #context_instance=RequestContext(request))
-\ No newline at end of file
+                          #context_instance=RequestContext(request))