diff bio/search_indexes.py @ 753:ad53d929281a

For issue #62, upgrade Haystack from 1.2.7 to 2.1.0.
author Brian Neal <bgneal@gmail.com>
date Fri, 03 Jan 2014 19:01:18 -0600
parents ee87ea74d46b
children cf9918328c64
line wrap: on
line diff
--- a/bio/search_indexes.py	Wed Jan 01 19:52:07 2014 -0600
+++ b/bio/search_indexes.py	Fri Jan 03 19:01:18 2014 -0600
@@ -1,30 +1,18 @@
 """Haystack search index for the bio application."""
-from haystack.indexes import *
-from haystack import site
-from custom_search.indexes import CondQueuedSearchIndex
+from haystack import indexes
 
 from bio.models import UserProfile
-from bio.signals import profile_content_update
 
 
-class UserProfileIndex(CondQueuedSearchIndex):
-    text = CharField(document=True, use_template=True)
-    author = CharField(model_attr='user')
+class UserProfileIndex(indexes.SearchIndex, indexes.Indexable):
+    text = indexes.CharField(document=True, use_template=True)
+    author = indexes.CharField(model_attr='user')
 
-    def index_queryset(self):
+    def get_model(self):
+        return UserProfile
+
+    def index_queryset(self, using=None):
         return UserProfile.objects.filter(user__is_active=True)
 
     def get_updated_field(self):
         return 'update_date'
-
-    def _setup_save(self, model):
-        profile_content_update.connect(self.enqueue_save)
-
-    def _teardown_save(self, model):
-        profile_content_update.disconnect(self.enqueue_save)
-
-    def enqueue_save(self, sender, **kwargs):
-        return self.enqueue('update', sender)
-
-
-site.register(UserProfile, UserProfileIndex)