summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-01-25 23:49:55 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-01-25 23:49:55 +0100
commitc255b30707aae7811dc5391c1615b9021a077352 (patch)
treebcfe81eeee590fc3265bb491515bd3cda8a54807
parent0429e5d91f08bd237bb96f6d440ebe4ee565a35f (diff)
downloadChimère-c255b30707aae7811dc5391c1615b9021a077352.tar.bz2
Chimère-c255b30707aae7811dc5391c1615b9021a077352.zip
Include properties to search indexes
-rw-r--r--chimere/search_indexes.py4
-rw-r--r--chimere/templates/search/indexes/chimere/marker_text.txt2
2 files changed, 5 insertions, 1 deletions
diff --git a/chimere/search_indexes.py b/chimere/search_indexes.py
index edf9bd1..f65f966 100644
--- a/chimere/search_indexes.py
+++ b/chimere/search_indexes.py
@@ -18,13 +18,13 @@
# 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()
@@ -42,8 +42,10 @@ class GeographicItemIndex(indexes.SearchIndex):
cats.append(cat.name)
return cats
+
class MarkerIndex(GeographicItemIndex, indexes.Indexable):
location = indexes.LocationField(model_attr='point')
+
def get_model(self):
return models.Marker
diff --git a/chimere/templates/search/indexes/chimere/marker_text.txt b/chimere/templates/search/indexes/chimere/marker_text.txt
index d089654..fd25c96 100644
--- a/chimere/templates/search/indexes/chimere/marker_text.txt
+++ b/chimere/templates/search/indexes/chimere/marker_text.txt
@@ -4,3 +4,5 @@
{{object.keywords}}
{% for category in object.categories.all %}{{category.keywords}}
{% endfor %}
+{% for property in object.getProperties %}{{property}}
+{% endfor %}