1 files changed, 21 insertions, 9 deletions

diff --git a/djangopypi/views.py b/djangopypi/views.py
index 03b92e5..0ac6dbc 100644
--- a/djangopypi/views.py
+++ b/djangopypi/views.py
@@ -21,7 +21,7 @@ from registration.backends import get_backend
 from registration.forms import RegistrationForm
 
 from djangopypi.models import Project, Classifier, Release, UPLOAD_TO
-from djangopypi.forms import ProjectForm, ReleaseForm, SearchForm
+from djangopypi.forms import ProjectForm, ReleaseForm
 from djangopypi.http import HttpResponseUnauthorized
 from djangopypi.http import HttpResponseNotImplemented
 from djangopypi.utils import decode_fs
@@ -230,15 +230,27 @@ def show_version(request, dist_name, version,
     return render_to_response(template_name, context_instance=context)
     
 def search(request):
+    search_value = ''
     if request.method == 'POST':
         search_value = request.POST.get('search_value')
-        matches = Project.objects.get(Q(name__contains=search_value) | Q(description__contains=search_value))
-        
-        return HttpResponse(matches)
+        if search_value != '':
+            dists = Project.objects.filter(Q(name__contains=search_value) | Q(summary__contains=search_value))
+            return render_to_response(
+                'djangopypi/search_results.html',
+                {'dists':dists,'search_value':search_value},
+                context_instance = RequestContext(request)
+                )
+        else:
+            dists = Project.objects.all()
+            return render_to_response(
+                'djangopypi/search_results.html',
+                {'search_value':search_value},
+                context_instance = RequestContext(request)
+                )
     else:
-        search_form = SearchForm()
+        dists = Project.objects.all()
         return render_to_response(
-            "djangopypi/search.html",
-            {'search_form':search_form},
-            context_instance=RequestContext(request)
-        )
\ No newline at end of file
+            'djangopypi/search_results.html',
+            {'search_value':search_value},
+            context_instance = RequestContext(request)
+            )
\ No newline at end of file