1 files changed, 11 insertions, 0 deletions
diff --git a/expo/views_logbooks.py b/expo/views_logbooks.py
index 9d69099..b44c770 100644
--- a/expo/views_logbooks.py
+++ b/expo/views_logbooks.py
@@ -1,6 +1,7 @@
 from django.shortcuts import render_to_response
 from troggle.expo.models import Expedition, Person, PersonExpedition, PersonTrip, LogbookEntry
 import troggle.settings as settings
+import search
 
 def personindex(request):
     persons = Person.objects.all()
@@ -14,4 +15,14 @@ def logbookentry(request, logbookentry_id):
     logbookentry = LogbookEntry.objects.filter(id = logbookentry_id)[0]
     return render_to_response('logbookentry.html', {'logbookentry': logbookentry, 'settings': settings})
 
+def logbookSearch(request, extra):
+    query_string = ''
+    found_entries = None
+    if ('q' in request.GET) and request.GET['q'].strip():
+        query_string = request.GET['q']
+	entry_query = search.get_query(query_string, ['text','title',])
+	found_entries = LogbookEntry.objects.filter(entry_query)
 
+    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