--- a/gpp/forums/search_indexes.py	Thu Apr 07 23:52:18 2011 +0000
+++ b/gpp/forums/search_indexes.py	Sat Apr 09 19:20:12 2011 +0000
@@ -3,7 +3,19 @@
 from haystack import site
 from queued_search.indexes import QueuedSearchIndex
 
-from forums.models import Forum, Post
+from forums.models import Forum, Topic, Post
+
+
+class TopicIndex(QueuedSearchIndex):
+    text = CharField(document=True, use_template=True)
+    author = CharField(model_attr='user')
+    pub_date = DateTimeField(model_attr='creation_date')
+
+    def get_queryset(self):
+        return Topic.objects.filter(forum__in=Forum.objects.public_forum_ids())
+
+    def get_updated_field(self):
+        return 'update_date'
 
 
 class PostIndex(QueuedSearchIndex):
@@ -13,10 +25,11 @@
 
     def get_queryset(self):
         return Post.objects.filter(
-                topic__forum__in=Forum.objects.public_forums())
+                topic__forum__in=Forum.objects.public_forum_ids())
 
     def get_updated_field(self):
         return 'update_date'
 
 
+site.register(Topic, TopicIndex)
 site.register(Post, PostIndex)