Added support for spelling mistakes, plus some tidying up of the search app

examples/vanilla/settings.py

@@ -214,6 +214,7 @@ OSCAR_RECENTLY_VIEWED_PRODUCTS = 4
 HAYSTACK_SITECONF = 'oscar.search_sites'
 HAYSTACK_SEARCH_ENGINE = 'solr'
 HAYSTACK_SOLR_URL = 'http://127.0.0.1:8080/solr'
+HAYSTACK_INCLUDE_SPELLING = True
 
 # Local overrides
 try:

oscar/apps/product/abstract_models.py

@@ -86,6 +86,8 @@ class AbstractItem(models.Model):
     recommended_items = models.ManyToManyField('product.Item', through='ProductRecommendation', blank=True)
     
     date_created = models.DateTimeField(auto_now_add=True)
+
+    # This field is used by Haystack to reindex search
     date_updated = models.DateTimeField(auto_now=True, null=True, default=None)
 
     objects = models.Manager()

oscar/apps/search/abstract_indexes.py

@@ -1,5 +1,8 @@
 from haystack.indexes import *
-from oscar.apps.product.models import Item
+
+from oscar.core.loading import import_module
+product_models = import_module('product.models', ['Item'])
+
 
 class AbstractProductIndex(SearchIndex):
     u"""
@@ -19,7 +22,7 @@ class AbstractProductIndex(SearchIndex):
 
         Orders by the most recently updated so that new objects are indexed first
         """
-        return Item.objects.order_by('-date_updated')
+        return product_models.Item.objects.order_by('-date_updated')
 
     def get_updated_field(self):
         u"""

oscar/apps/search/context_processors.py

@@ -1,7 +1,8 @@
-from oscar.apps.search.forms import MultiFacetedSearchForm
+from oscar.core.loading import import_module
+search_forms = import_module('search.forms', ['MultiFacetedSearchForm'])
 
 def search_form(request):
-    '''
+    u"""
     Ensures that the search form is available site wide
-    '''
-    return {'search_form': MultiFacetedSearchForm(request.GET)}
+    """
+    return {'search_form': search_forms.MultiFacetedSearchForm(request.GET)}

oscar/apps/search/forms.py

@@ -18,7 +18,7 @@ class MultiFacetedSearchForm(FacetedSearchForm):
     '''
     An extension of the regular faceted search form to alow for multiple facets
     '''
-    q = forms.CharField(required=False, label=_('Search'), widget=SearchInput({ "placeholder": _('Search') }))
+    q = forms.CharField(required=False, label=_('Search'), widget=SearchInput({"placeholder": _('Search')}))
 
     def search(self):
         '''

oscar/apps/search/search_indexes.py

@@ -1,9 +1,13 @@
 from haystack import site
+
 from oscar.apps.search.abstract_indexes import AbstractProductIndex
-from oscar.apps.product.models import Item
+from oscar.core.loading import import_module
+product_models = import_module('product.models', ['Item'])
+
 
 class ProductIndex(AbstractProductIndex):
     pass
 
-site.register(Item, ProductIndex)
+
+site.register(product_models.Item, ProductIndex)
 

oscar/apps/search/urls.py

@@ -1,17 +1,20 @@
 from django.conf.urls.defaults import *
 from haystack.query import SearchQuerySet
 
-from oscar.apps.search.views import Suggestions, MultiFacetedSearchView
-from oscar.apps.search.forms import MultiFacetedSearchForm
-from oscar.apps.search.search_indexes import ProductIndex
+from oscar.core.loading import import_module
+search_views = import_module('search.views', ['Suggestions', 'MultiFacetedSearchView'])
+search_forms = import_module('search.forms', ['MultiFacetedSearchForm'])
+search_indexes = import_module('search.search_indexes', ['ProductIndex'])
+
 
 sqs = SearchQuerySet()
-for field_name, field in ProductIndex.fields.items():
+for field_name, field in search_indexes.ProductIndex.fields.items():
     if field.faceted is True:
-        #ensure we facet the results set by the defined facetable fields
+        # Ensure we facet the results set by the defined facetable fields
         sqs.facet(field_name)
 
-urlpatterns = patterns('search.views',
-    url(r'^suggest/$', Suggestions.as_view(), name='oscar-search-suggest'),
-    url(r'^$', MultiFacetedSearchView(form_class=MultiFacetedSearchForm, searchqueryset=sqs), name='oscar-search'),
+urlpatterns = patterns('search.apps.views',
+    url(r'^suggest/$', search_views.Suggestions.as_view(), name='oscar-search-suggest'),
+    url(r'^$', search_views.MultiFacetedSearchView(form_class=search_forms.MultiFacetedSearchForm, 
+        searchqueryset=sqs), name='oscar-search'),
 )

oscar/apps/search/views.py

@@ -59,7 +59,7 @@ class MultiFacetedSearchView(FacetedSearchView):
     """
     template = 'search/results.html'
 
-    def __call__(self, request):
+    def __call__(self, request, *args, **kwargs):
         """
         Generates the actual response to the search.
         
@@ -74,7 +74,7 @@ class MultiFacetedSearchView(FacetedSearchView):
         except product_models.Item.DoesNotExist:
             pass
         
-        return super(MultiFacetedSearchView, self)(*args, **kwargs)
+        return super(MultiFacetedSearchView, self).__call__(request, *args, **kwargs)
 
     def __name__(self):
         return "MultiFacetedSearchView"

oscar/templates/search/results.html

@@ -2,7 +2,11 @@
 {% load currency_filters %}
 
 {% block content %}
-<h2>Search</h2>
+<h2>Search for '{{ query }}'</h2>
+
+{% if suggestion %}
+Did you mean <a href="{% url oscar-search %}?q={{ suggestion }}">{{ suggestion }}</a>?
+{% endif %}
 
 <ol>
 {% for result in page.object_list %}