Merge branch 'master' into nef

Conflicts:
	chimere/admin.py
	chimere/forms.py
	chimere/models.py
	chimere/settings.sample.py
	chimere/static/chimere/js/jquery.chimere-ol.js
	chimere/templates/chimere/base.html
	chimere/templates/chimere/blocks/head_chimere.html
	chimere/templates/chimere/blocks/map.html
	chimere/templates/chimere/main_map.html
	chimere/templatetags/chimere_tags.py
	chimere/tests.py
	chimere/urls.py
	chimere/views.py
	chimere/widgets.py

1 files changed, 59 insertions, 0 deletions

diff --git a/chimere/search_indexes.py b/chimere/search_indexes.py
new file mode 100644
index 0000000..5e4a69a
--- /dev/null
+++ b/chimere/search_indexes.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+#
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# See the file COPYING for details.
+
+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)
+    categories = indexes.MultiValueField()
+    # for autocomplete
+    content_auto = indexes.EdgeNgramField(model_attr='name')
+
+    def index_queryset(self, using=None):
+        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 = []
+        for cat in obj.categories.all():
+            cats.append(cat.name)
+        return cats
+
+class MarkerIndex(GeographicItemIndex, indexes.Indexable):
+    location = indexes.LocationField(model_attr='point')
+    def get_model(self):
+        return models.Marker
+
+"""
+class RouteIndex(GeographicItemIndex, indexes.Indexable):
+    location = indexes.LocationField()
+    def get_model(self):
+        return models.Route
+
+    def prepare_location(self, obj):
+        centroid = obj.route.centroid
+        return "%s,%s" % (centroid.y, centroid.x)
+"""