diff options
Diffstat (limited to 'chimere/search_indexes.py')
| -rw-r--r-- | chimere/search_indexes.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chimere/search_indexes.py b/chimere/search_indexes.py index 6b57450..5e4a69a 100644 --- a/chimere/search_indexes.py +++ b/chimere/search_indexes.py @@ -20,7 +20,10 @@ import datetime from haystack import indexes +from django.db.models import Q + from chimere import models +from chimere.views import checkDate class GeographicItemIndex(indexes.SearchIndex): text = indexes.CharField(document=True, use_template=True) @@ -29,7 +32,9 @@ class GeographicItemIndex(indexes.SearchIndex): content_auto = indexes.EdgeNgramField(model_attr='name') def index_queryset(self, using=None): - return self.get_model().objects.filter(status='A') + q = checkDate(Q(status='A', categories__available=True, + categories__category__available=True)) + return self.get_model().objects.filter(q).distinct('pk').order_by('pk') def prepare_categories(self, obj): cats = [] @@ -42,6 +47,7 @@ class MarkerIndex(GeographicItemIndex, indexes.Indexable): def get_model(self): return models.Marker +""" class RouteIndex(GeographicItemIndex, indexes.Indexable): location = indexes.LocationField() def get_model(self): @@ -50,3 +56,4 @@ class RouteIndex(GeographicItemIndex, indexes.Indexable): def prepare_location(self, obj): centroid = obj.route.centroid return "%s,%s" % (centroid.y, centroid.x) +""" |