Bumped haystack to 2.0.0-beta

This is needed for internal Tangent projects.  The search app in oscar
still needs some work but it works in a very basic fashion at the
moment.

The template for search results still needs attention.

.gitignore

@@ -34,3 +34,4 @@ sandbox/public/
 logs/
 build/
 *.pdf
+sandbox/whoosh_index

oscar/apps/search/__init__.py

@@ -1 +0,0 @@
-import oscar.search_sites

oscar/apps/search/abstract_indexes.py

@@ -1,35 +0,0 @@
-from haystack.indexes import *
-
-from oscar.core.loading import import_module
-product_models = import_module('catalogue.models', ['Product'])
-
-
-class AbstractProductIndex(SearchIndex):
-    u"""
-    Base class for products solr index definition.  Overide by creating your
-    own copy of oscar.search_indexes.py
-    """
-    text = EdgeNgramField(document=True, use_template=True, template_name='search/indexes/product/item_text.txt')
-    title = EdgeNgramField(model_attr='title', null=True)
-    upc = CharField(model_attr="upc", null=True)
-    product_score = FloatField(model_attr="score")
-    date_created = DateTimeField(model_attr='date_created')
-    date_updated = DateTimeField(model_attr='date_updated')
-
-    def index_queryset(self):
-        """
-        Used when the entire index for model is updated.
-
-        Orders by the most recently updated so that new objects are indexed first
-        """
-        return product_models.Product.objects.order_by('-date_updated')
-
-    def get_updated_field(self):
-        u"""
-        Used to specify the field used to determine if an object has been updated
-
-        Can be used to filter the query set when updating the index
-        """
-        return 'date_updated'
-
-

oscar/apps/search/app.py

@@ -1,30 +1,17 @@
 from django.conf.urls.defaults import patterns, url
-from django.contrib.admin.views.decorators import staff_member_required
-from haystack.query import SearchQuerySet
 
 from oscar.core.application import Application
-from oscar.apps.search.views import SuggestionsView, MultiFacetedSearchView
-from oscar.apps.search.search_indexes import ProductIndex
+from oscar.apps.search.views import MultiFacetedSearchView
 from oscar.apps.search.forms import MultiFacetedSearchForm
 
 
 class SearchApplication(Application):
     name = 'search'
-    
-    suggestions_view = SuggestionsView
     search_view = MultiFacetedSearchView
 
     def get_urls(self):
-        sqs = SearchQuerySet()
-        for field_name, field in ProductIndex.fields.items():
-            if field.faceted is True:
-                # Ensure we facet the results set by the defined facetable fields
-                sqs.facet(field_name)
-        
         urlpatterns = patterns('',
-            url(r'^suggest/$', self.suggestions_view.as_view(), name='suggest'),
-            url(r'^$', self.search_view(form_class=MultiFacetedSearchForm, 
-                                        searchqueryset=sqs), name='search'),
+            url(r'^$', self.search_view(form_class=MultiFacetedSearchForm), name='search'),
         )
         return self.post_process_urls(urlpatterns)
 

oscar/apps/search/forms.py

@@ -24,7 +24,7 @@ class MultiFacetedSearchForm(FacetedSearchForm):
         '''
         Overriding the search method to allow for multiple facets
         '''
-        sqs = super(FacetedSearchForm, self).search().order_by('-score')
+        sqs = super(FacetedSearchForm, self).search()
         if hasattr(self, 'cleaned_data') and 'selected_facets' in self.cleaned_data:
             for f in self.cleaned_data['selected_facets'].split("|"):
                 sqs = sqs.narrow(f)

oscar/apps/search/search_indexes.py

@@ -1,19 +1,37 @@
-from haystack import site
-from haystack.exceptions import AlreadyRegistered
+from haystack import indexes
 
-from oscar.apps.search.abstract_indexes import AbstractProductIndex
-from oscar.core.loading import import_module
-product_models = import_module('catalogue.models', ['Product'])
+from django.db.models import get_model
 
 
-class ProductIndex(AbstractProductIndex):
-    pass
+class ProductIndex(indexes.SearchIndex, indexes.Indexable):
+    """
+    Base class for products solr index definition.  Overide by creating your
+    own copy of oscar.search_indexes.py
+    """
+    text = indexes.EdgeNgramField(document=True, use_template=True,
+                                  template_name='oscar/search/indexes/product/item_text.txt')
+    title = indexes.EdgeNgramField(model_attr='title', null=True)
+    upc = indexes.CharField(model_attr="upc", null=True)
+    date_created = indexes.DateTimeField(model_attr='date_created')
+    date_updated = indexes.DateTimeField(model_attr='date_updated')
 
+    def get_model(self):
+        return get_model('catalogue', 'Product')
+
+    def index_queryset(self):
+        """
+        Used when the entire index for model is updated.
+
+        Orders by the most recently updated so that new objects are indexed first
+        """
+        return self.get_model().objects.order_by('-date_updated')
+
+    def get_updated_field(self):
+        """
+        Used to specify the field used to determine if an object has been updated
+
+        Can be used to filter the query set when updating the index
+        """
+        return 'date_updated'
 
-try:
-    site.register(product_models.Product, ProductIndex)
-except AlreadyRegistered:
-    # If already registered, it means that a different search app is being
-    # used to search products.
-    pass
 

oscar/apps/search/views.py

@@ -3,7 +3,6 @@ import json
 from django.http import HttpResponse, HttpResponseRedirect
 from django.views.generic.base import View
 from django.conf import settings
-from django.template.response import TemplateResponse
 from haystack.query import SearchQuerySet
 from haystack.views import FacetedSearchView
 
@@ -55,7 +54,7 @@ class SuggestionsView(View):
 
 
 class MultiFacetedSearchView(FacetedSearchView):
-    u"""
+    """
     Search view for multifaceted searches
     """
     template = 'search/results.html'
@@ -63,18 +62,16 @@ class MultiFacetedSearchView(FacetedSearchView):
     def __call__(self, request, *args, **kwargs):
         """
         Generates the actual response to the search.
-        
+
         Relies on internal, overridable methods to construct the response.
         """
-        
         # Look for UPC match
-        query = request.GET['q'].strip()
+        query = request.GET.get('q', '').strip()
         try:
             item = product_models.Product._default_manager.get(upc=query)
             return HttpResponseRedirect(item.get_absolute_url())
         except product_models.Product.DoesNotExist:
             pass
-        
         return super(MultiFacetedSearchView, self).__call__(request, *args, **kwargs)
 
     @property

oscar/search_sites.py

@@ -1,3 +0,0 @@
-import haystack
-
-haystack.autodiscover()

oscar/templates/oscar/search/results.html

@@ -3,9 +3,27 @@
 {% load thumbnail %}
 {% load i18n %}
 
+{% block title %}
+"{{ query }}" | {{ block.super }}
+{% endblock %}
+
+{% block breadcrumbs %}
+<ul class="breadcrumb">
+	<li>
+	<a href="{% url promotions:home %}">{% trans "Home" %}</a>
+	<span class="divider">/</span>
+	</li>
+	<li>
+	{% trans "Search" %}
+	<span class="divider">/</span>
+	</li>
+	<li class="active"><a href=".">{% blocktrans with q=query%}"{{ q }}"{% endblocktrans %}</a></li>
+</ul>
+{% endblock %}
+
 {% block header%}
 <div class="page-header">
-    <h1>{% trans 'Search for' %} '{{ query }}'</h1>
+	<h1>{% trans 'Search for' %} '{{ query }}'</h1>
 </div>
 {% endblock %}
 
@@ -16,38 +34,17 @@
 {% endif %}
 
 {% if page.object_list %}
-    <ol class="products vertical three">
-        {% for result in page.object_list %}
-        <li>
-            <article class="product_pod">
-            {% with image=product.primary_image %}
-            {% thumbnail image.original "400x400" upscale=False as thumb %}
-            <a href="{{ product.get_absolute_url }}"><img class="thumbnail" src="{{ thumb.url }}" alt="{{ product.get_title }}"></a>
-            {% endthumbnail %}
-            {% endwith %}
-            <h3><a href="{{ result.object.get_absolute_url }}">{{ result.object.get_title }}</a></h3>
-            <div class="product_price">
-                {% if result.object.is_group %}
-                    <p>From {{ result.object.min_variant_price_incl_tax|currency }}</p>
-                {% else %}
-                    {% if result.object.has_stockrecord %}
-                        <h4>{{ result.object.stockrecord.price_incl_tax|currency }}</h4>
-                         <p class="app-ico avaliability instock">{{ result.object.stockrecord.availability }}</p>
-                     {% else %}
-                         <p class="app-ico avaliability outstock">{% trans 'Not available' %}</p>
-                     {% endif %}
-                {% endif %}
-            </div>
-            </article>    
-        </li>
-        {% endfor %}
-    </ol>
+<ol class="products vertical three">
+	{% for result in page.object_list %}
+	{% include "catalogue/partials/product.html" with product=result.object %}
+	{% endfor %}
+</ol>
 {% else %}
-    <p>{% trans 'No search results found.' %}</p>
+<p>{% trans 'No search results found.' %}</p>
 {% endif %}
 
 {% if page_obj %}
-    {% include "catalogue/partials/pagination.html" %}
+{% include "catalogue/partials/pagination.html" %}
 {% endif %}
 
 {% endblock %}

requirements.txt

@@ -18,3 +18,4 @@ pinocchio==0.3.1
 nose-progressive==1.3
 django-nose==1.1
 django-rosetta==0.6.8
+Whoosh==2.4.1

sandbox/settings.py

@@ -107,7 +107,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'oscar.apps.promotions.context_processors.promotions',
     'oscar.apps.checkout.context_processors.checkout',
     'oscar.core.context_processors.metadata',
-) 
+)
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
@@ -229,8 +229,12 @@ LOGIN_REDIRECT_URL = '/accounts/'
 APPEND_SLASH = True
 
 # Haystack settings
-HAYSTACK_SITECONF = 'oscar.search_sites'
-HAYSTACK_SEARCH_ENGINE = 'dummy'
+HAYSTACK_CONNECTIONS = {
+    'default': {
+        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
+    },
+}
 
 DEBUG_TOOLBAR_CONFIG = {
     'INTERCEPT_REDIRECTS': False

sandbox/update_sandbox.sh

@@ -14,6 +14,7 @@ cd sandbox
 ./manage.py syncdb --noinput
 ./manage.py migrate
 ./manage.py collectstatic --noinput
+./manage.py rebuild_index --noinput
 
 # Re-compile python code
 touch deploy/wsgi/sandbox.wsgi

setup.py

@@ -29,12 +29,13 @@ setup(name='django-oscar',
           'PIL==1.1.7',
           'South==0.7.3',
           'django-extra-views==0.2.0',
-          'django-haystack==1.2.7',
+          'django-haystack==2.0.0-beta',
           'django-treebeard==1.61',
           'sorl-thumbnail==11.12',
           'python-memcached==1.48',
           'django-sorting==0.1',
           ],
+      dependency_links=['http://github.com/toastdriven/django-haystack/tarball/master#egg=django-haystack-2.0.0-beta'],
       # See http://pypi.python.org/pypi?%3Aaction=list_classifiers
       classifiers=['Environment :: Web Environment',
                    'Framework :: Django',

tests/config.py

@@ -50,12 +50,15 @@ def configure(nose_args):
                 'oscar.apps.customer.auth_backends.Emailbackend',
                 'django.contrib.auth.backends.ModelBackend',
                 ),
+            HAYSTACK_CONNECTIONS={
+                'default': {
+                    'ENGINE': 'haystack.backends.simple_backend.SimpleEngine',
+                }
+            },
             ROOT_URLCONF='tests.site.urls',
             LOGIN_REDIRECT_URL='/accounts/',
             DEBUG=False,
             SITE_ID=1,
-            HAYSTACK_SEARCH_ENGINE='dummy',
-            HAYSTACK_SITECONF = 'oscar.search_sites',
             APPEND_SLASH=True,
             NOSE_ARGS=nose_args,
             **OSCAR_SETTINGS