Compatibility fixes.

[prawokultury.git] / events / search_indexes.py

diff --git a/events/search_indexes.py b/events/search_indexes.py
index 9977957..6b30345 100644 (file)
--- a/events/search_indexes.py
+++ b/events/search_indexes.py
@@ -1,26 +1,26 @@
-from django.conf import settings

 import datetime
 import datetime

+from django.conf import settings

 from haystack import indexes
 from haystack import indexes

+from fnpdjango.utils.models.translation import add_translatable_index, localize_field

 from events.models import Event
 from events.models import Event

-from migdal.helpers import add_translatable_index

 
 
 
 

-class EventIndex(indexes.RealTimeSearchIndex, indexes.Indexable):
+class EventIndex(indexes.SearchIndex, indexes.Indexable):
+    text = indexes.CharField(null=True,
+        model_attr=localize_field('title', settings.LANGUAGE_CODE),
+        document=True)
+

     def get_model(self):
         return Event
 
     def get_model(self):
         return Event
 

-    def index_queryset(self):
-        """Used when the entire index for model is updated."""
-        return self.get_model().objects.all()
-

 
 add_translatable_index(EventIndex, {
 
 add_translatable_index(EventIndex, {

-# Haystack needs a main field to be the same across all indexes
-# so we treat title of the event as this main content, named 'body'
-   'body': indexes.CharField(model_attr='title', null=True),
-   'organizer': indexes.CharField(null=True),
-   'place': indexes.CharField(null=True)
-   })
-
+    'organizer': indexes.CharField(null=True),
+    'place': indexes.CharField(null=True)
+    })

 
 

-getattr(EventIndex, "body_%s" % settings.LANGUAGE_CODE).document = True
+add_translatable_index(EventIndex, {
+    'title': indexes.CharField(null=True),
+    }, 
+    (lang for lang in settings.LANGUAGES if lang[0] != settings.LANGUAGE_CODE)
+)