started migrating the score field to points, models, views and test

migrated.

Added search indexes.

1 files changed, 12 insertions, 26 deletions

diff --git a/askbot/search/haystack/__init__.py b/askbot/search/haystack/__init__.py
index 8376a0fc..8f008a93 100644
--- a/askbot/search/haystack/__init__.py
+++ b/askbot/search/haystack/__init__.py
@@ -5,39 +5,25 @@ except ImportError:
 
 from askbot.models import Post, Thread, Tag, User
 
-#class ThreadIndex(indexes.SearchIndex):
-#    text = indexes.CharField(document=True, use_template=True)
-#    title = indexes.CharField(model_attr='title')
-#
-#    def index_queryset(self):
-#        return Thread.objects.all()
-#
-#    def prepare(self, obj):
-#        self.prepared_data = super(ThreadIndex, self).prepare(object)
-#
-#        self.prepared_data['tags'] = [tag.name for tag in objects.tags.all()]
-#
-#class PostIndex(indexes.SearchIndex):
-#    text = indexes.CharField(document=True, use_template=True)
-#    post_text = indexes.CharField(model_attr='text')
-#    author = indexes.CharField(model_attr='user')
-#
-#    def index_queryset(self):
-#        return Post.objects.all()
+class ThreadIndex(indexes.SearchIndex):
+    text = indexes.CharField(document=True, use_template=True)
+    title = indexes.CharField(model_attr='title')
+
+    def index_queryset(self):
+        return Thread.objects.all()
+
+    def prepare(self, obj):
+        self.prepared_data = super(ThreadIndex, self).prepare(object)
+
+        self.prepared_data['tags'] = [tag.name for tag in objects.tags.all()]
 
 class PostIndex(indexes.SearchIndex):
     text = indexes.CharField(document=True, use_template=True)
     post_text = indexes.CharField(model_attr='text')
-    title = indexes.CharField(model_attr='thread__jtitle')
     author = indexes.CharField(model_attr='user')
 
-    def prepare(self, obj):
-        self.prepared_data = super(PostIndex, self).prepare(obj)
-        if obj.thread:
-            self.prepared_data['tags'] = [tag.name for tag in obj.thread.tags.all()]
-
     def index_queryset(self):
         return Post.objects.all()
 
 site.register(Post, PostIndex)
-#site.register(Thread, ThreadIndex)
+site.register(Thread, ThreadIndex)