Refactored the save code into its own method, which can now be overriden.

Author: twidi

AUTHORS

@@ -4,4 +4,4 @@ Primary author:
 
 Contributors:
 
-* 
+* Stéphane Angel (twidi) for factoring out the save method in ``SavedSearchView``.

saved_searches/views.py

@@ -18,61 +18,65 @@ class SavedSearchView(SearchView):
     Automatically handles saving the queries when they are run.
     """
     search_key = 'general'
-    
+
     def __init__(self, *args, **kwargs):
         if 'search_key' in kwargs:
             self.search_key = kwargs['search_key']
             del(kwargs['search_key'])
-        
+
         super(SavedSearchView, self).__init__(*args, **kwargs)
-    
-    def create_response(self):
+
+    def save_search(self, page):
         """
-        Saves the details of a user's search and then generates the actual
-        HttpResponse to send back to the user.
+        Only save the search if we're on the first page.
+        This will prevent an excessive number of duplicates for what is
+        essentially the same search.
         """
-        (paginator, page) = self.build_page()
-        
-        # Only save the search if we're on the first page.
-        # This will prevent an excessive number of duplicates for what is
-        # essentially the same search.
         if self.query and page.number == 1:
             # Save the search.
             saved_search = SavedSearch(
                 search_key=self.search_key,
                 user_query=self.query,
                 result_count=len(self.results)
             )
-            
+
             if hasattr(self.results, 'query'):
                 query_seen = self.results.query.build_query()
-            
+
                 if isinstance(query_seen, basestring):
                     saved_search.full_query = query_seen
-            
+
             if self.request.user.is_authenticated():
                 saved_search.user = self.request.user
-            
+
             saved_search.save()
-        
+
+    def create_response(self):
+        """
+        Saves the details of a user's search and then generates the actual
+        ``HttpResponse`` to send back to the user.
+        """
+        (paginator, page) = self.build_page()
+        self.save_search(page)
+
         context = {
             'query': self.query,
             'form': self.form,
             'page': page,
             'paginator': paginator,
         }
         context.update(self.extra_context())
-        
+
         return render_to_response(self.template, context, context_instance=self.context_class(self.request))
 
 
 def most_recent(request, username=None, search_key=None):
     """
     Shows the most recent search results.
-    
+
     The ``username`` kwarg should be the ``username`` field of
     ``django.contrib.auth.models.User``. The ``search_key`` can be any string.
-    
+
     Template::
         ``saved_searches/most_recent.html``
     Context::
@@ -89,15 +93,15 @@ def most_recent(request, username=None, search_key=None):
         user = get_object_or_404(User, username=username)
     else:
         user = None
-    
+
     most_recent = SavedSearch.objects.most_recent(user=user, search_key=search_key, threshold=SAVED_SEARCHES_THRESHOLD)
     paginator = Paginator(most_recent, SAVED_SEARCHES_PER_PAGE)
-    
+
     try:
         page = paginator.page(int(request.GET.get('page', 1)))
     except InvalidPage:
         raise Http404("Invalid page.")
-    
+
     return render_to_response('saved_searches/most_recent.html', {
         'by_user': user,
         'by_search_key': search_key,
@@ -109,10 +113,10 @@ def most_recent(request, username=None, search_key=None):
 def most_popular(request, username=None, search_key=None):
     """
     Shows the most popular search results.
-    
+
     The ``username`` kwarg should be the ``username`` field of
     ``django.contrib.auth.models.User``. The ``search_key`` can be any string.
-    
+
     Template::
         ``saved_searches/most_popular.html``
     Context::
@@ -129,19 +133,19 @@ def most_popular(request, username=None, search_key=None):
         user = get_object_or_404(User, username=username)
     else:
         user = None
-    
+
     most_recent = SavedSearch.objects.most_popular(user=user, search_key=search_key, threshold=SAVED_SEARCHES_THRESHOLD)
     paginator = Paginator(most_recent, SAVED_SEARCHES_PER_PAGE)
-    
+
     try:
         page = paginator.page(int(request.GET.get('page', 1)))
     except InvalidPage:
         raise Http404("Invalid page.")
-    
+
     return render_to_response('saved_searches/most_popular.html', {
         'by_user': user,
         'by_search_key': search_key,
         'page': page,
         'paginator': paginator,
     }, context_instance=RequestContext(request))
-    
+