X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/b294f0a6d6dee39995ba29fc83f39fd4733b46f3..4fd0861aa9d51262d5afcdc40ea48e7ce7ec7aaa:/philo/contrib/sobol/models.py

diff --git a/philo/contrib/sobol/models.py b/philo/contrib/sobol/models.py
index 82fe947..27f91d1 100644
--- a/philo/contrib/sobol/models.py
+++ b/philo/contrib/sobol/models.py
@@ -11,7 +11,7 @@ from django.http import HttpResponseRedirect, Http404, HttpResponse
 from django.utils import simplejson as json
 from django.utils.datastructures import SortedDict
 
-from philo.contrib.sobol import registry
+from philo.contrib.sobol import registry, get_search_instance
 from philo.contrib.sobol.forms import SearchForm
 from philo.contrib.sobol.utils import HASH_REDIRECT_GET_KEY, URL_REDIRECT_GET_KEY, SEARCH_ARG_GET_KEY, check_redirect_hash, RegistryIterator
 from philo.exceptions import ViewCanNotProvideSubpath
@@ -172,10 +172,10 @@ else:
 
 
 class SearchView(MultiView):
-	"""Handles a view for the results of a search, and an AJAX API for asynchronous search result loading. This can be particularly useful if some searches are slow."""
+	"""Handles a view for the results of a search, anonymously tracks the selections made by end users, and provides an AJAX API for asynchronous search result loading. This can be particularly useful if some searches are slow."""
 	#: :class:`ForeignKey` to a :class:`.Page` which will be used to render the search results.
 	results_page = models.ForeignKey(Page, related_name='search_results_related')
-	#: A class:`.SlugMultipleChoiceField` whose choices are the contents of the :class:`.SearchRegistry`
+	#: A :class:`.SlugMultipleChoiceField` whose choices are the contents of the :class:`.SearchRegistry`
 	searches = RegistryChoiceField(choices=registry.iterchoices())
 	#: A :class:`BooleanField` which controls whether or not the AJAX API is enabled.
 	#:
@@ -206,15 +206,11 @@ class SearchView(MultiView):
 			)
 		return urlpatterns
 	
-	def get_search_instance(self, slug, search_string):
-		"""Returns an instance of the :class:`.BaseSearch` subclass corresponding to ``slug`` in the :class:`.SearchRegistry` and instantiated with ``search_string``."""
-		return registry[slug](search_string.lower())
-	
 	def results_view(self, request, extra_context=None):
 		"""
 		Renders :attr:`results_page` with a context containing an instance of :attr:`search_form`. If the form was submitted and was valid, then one of two things has happened:
 		
-		* A search has been initiated. In this case, a list of search instances will be added to the context as 'searches'. If :attr:`enable_ajax_api` is enabled, each instance will have an "ajax_api_url" attribute containing the url needed to make an AJAX request for the search results.
+		* A search has been initiated. In this case, a list of search instances will be added to the context as ``searches``. If :attr:`enable_ajax_api` is enabled, each instance will have an ``ajax_api_url`` attribute containing the url needed to make an AJAX request for the search results.
 		* A link has been chosen. In this case, corresponding :class:`Search`, :class:`ResultURL`, and :class:`Click` instances will be created and the user will be redirected to the link's actual url.
 		
 		"""
@@ -245,11 +241,12 @@ class SearchView(MultiView):
 				
 				search_instances = []
 				for slug in self.searches:
-					search_instance = self.get_search_instance(slug, search_string)
-					search_instances.append(search_instance)
+					if slug in registry:
+						search_instance = get_search_instance(slug, search_string)
+						search_instances.append(search_instance)
 					
-					if self.enable_ajax_api:
-						search_instance.ajax_api_url = "%s?%s=%s" % (self.reverse('ajax_api_view', kwargs={'slug': slug}, node=request.node), SEARCH_ARG_GET_KEY, search_string)
+						if self.enable_ajax_api:
+							search_instance.ajax_api_url = "%s?%s=%s" % (self.reverse('ajax_api_view', kwargs={'slug': slug}, node=request.node), SEARCH_ARG_GET_KEY, search_string)
 				
 				if eventlet and not self.enable_ajax_api:
 					pool = eventlet.GreenPool()
@@ -274,19 +271,23 @@ class SearchView(MultiView):
 		
 		results
 			Contains the results of :meth:`.Result.get_context` for each result.
-		
 		rendered
 			Contains the results of :meth:`.Result.render` for each result.
+		hasMoreResults
+			``True`` or ``False`` whether the search has more results according to :meth:`BaseSearch.has_more_results`
+		moreResultsURL
+			Contains None or a querystring which, once accessed, will note the :class:`Click` and redirect the user to a page containing more results.
 		
 		"""
 		search_string = request.GET.get(SEARCH_ARG_GET_KEY)
 		
-		if not request.is_ajax() or not self.enable_ajax_api or slug not in self.searches or search_string is None:
+		if not request.is_ajax() or not self.enable_ajax_api or slug not in registry or slug not in self.searches or search_string is None:
 			raise Http404
 		
-		search_instance = self.get_search_instance(slug, search_string)
+		search_instance = get_search_instance(slug, search_string)
 		
 		return HttpResponse(json.dumps({
-			'results': [result.get_context() for result in search_instance.results],
-			'rendered': [result.render() for result in search_instance.results]
+			'results': [result.render() for result in search_instance.results],
+			'hasMoreResults': search_instance.has_more_results,
+			'moreResultsURL': (u"?%s" % search_instance.more_results_querydict.urlencode()) if search_instance.more_results_querydict else None,
 		}), mimetype="application/json")
\ No newline at end of file