Adding src/ for docker

modif for advance search

diff --git a/src/django-haystack b/src/django-haystack
new file mode 160000 (submodule)
index 0000000..97475f2
--- /dev/null
+++ b/src/django-haystack
@@ -0,0 +1 @@
+Subproject commit 97475f2813a36e402296d5f2389fe10cd4cd1e0b

diff --git a/telemeta/search_indexes.py b/telemeta/search_indexes.py
index 9738d5522ed405d303d803596b5ba456cd995057..ae7e95bf5a57a187c005988607b5d78c58213e23 100644 (file)
--- a/telemeta/search_indexes.py
+++ b/telemeta/search_indexes.py
@@ -4,8 +4,9 @@ from telemeta.models import *
 
 class MediaItemIndex(indexes.SearchIndex, indexes.Indexable):
 
-    text = indexes.NgramField(document=True, use_template=True)
-    #rec_date = indexes.DateTimeField(use_template=True, null=True)
+    text = indexes.CharField(document=True, use_template=True)
+    item_acces = indexes.CharField(model_attr= 'collection__public_access' , faceted=True)
+    item_status = indexes.CharField(model_attr= 'collection__document_status' , faceted=True)
 
     def get_model(self):
         return MediaItem

diff --git a/telemeta/views/haystack_search.py b/telemeta/views/haystack_search.py
index eda86b2ddd7da8223c1db114a94d0a2ff1b03080..75892281f8449b9591f5468f5d8e78e41af42a2e 100644 (file)
--- a/telemeta/views/haystack_search.py
+++ b/telemeta/views/haystack_search.py
@@ -30,3 +30,8 @@ class HaystackSearch(SearchView):
             extra['type']='item'
         return extra
 
+
+class HaystackAdvanceSearch(SearchView):
+
+    def get_query(self):
+        return super(HaystackAdvanceSearch, self).get_query()