From 7ff06a265732a23fad06c9f3c378b8ef58d5e1e5 Mon Sep 17 00:00:00 2001 From: afilsaime Date: Thu, 23 Apr 2015 16:18:44 +0200 Subject: [PATCH] change urls and begin faceting --- src/django-haystack | 1 + src/pip-delete-this-directory.txt | 5 +++++ telemeta/forms/haystack_form.py | 2 -- telemeta/haystack_urls.py | 5 +---- telemeta/search_indexes.py | 5 +++-- telemeta/views/vuetest.py | 1 - 6 files changed, 10 insertions(+), 9 deletions(-) create mode 160000 src/django-haystack create mode 100644 src/pip-delete-this-directory.txt delete mode 100644 telemeta/views/vuetest.py diff --git a/src/django-haystack b/src/django-haystack new file mode 160000 index 00000000..97475f28 --- /dev/null +++ b/src/django-haystack @@ -0,0 +1 @@ +Subproject commit 97475f2813a36e402296d5f2389fe10cd4cd1e0b diff --git a/src/pip-delete-this-directory.txt b/src/pip-delete-this-directory.txt new file mode 100644 index 00000000..c8883ea9 --- /dev/null +++ b/src/pip-delete-this-directory.txt @@ -0,0 +1,5 @@ +This file is placed here by pip to indicate the source was put +here by pip. + +Once this package is successfully installed this source code will be +deleted (unless you remove this file). diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py index 8a590950..9023c8ed 100644 --- a/telemeta/forms/haystack_form.py +++ b/telemeta/forms/haystack_form.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- -from django import forms from telemeta.models import * -from haystack.inputs import AutoQuery, Exact, Clean from haystack.forms import * from haystack.query import SearchQuerySet diff --git a/telemeta/haystack_urls.py b/telemeta/haystack_urls.py index 76147a4e..35f0a272 100644 --- a/telemeta/haystack_urls.py +++ b/telemeta/haystack_urls.py @@ -1,14 +1,11 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, url, include from telemeta.views.haystack_search import * -from haystack.query import SearchQuerySet -from haystack.views import SearchView from haystack.forms import * -from telemeta.forms.haystack_form import HaySearchFormItem, HaySearchFormCollection urlpatterns = patterns('', url(r'^$', HaystackSearch(form_class=HaySearchFormItem), name='haystack_search'), - url(r'^(?P[A-Za-z0-9._-]+)/$', HaystackSearch(), name='haystack_search_type'), + url(r'^quick/(?P[A-Za-z0-9._-]+)/$', HaystackSearch(), name='haystack_search_type'), ) diff --git a/telemeta/search_indexes.py b/telemeta/search_indexes.py index 9738d552..ae7e95bf 100644 --- 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/vuetest.py b/telemeta/views/vuetest.py deleted file mode 100644 index 40a96afc..00000000 --- a/telemeta/views/vuetest.py +++ /dev/null @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- -- 2.39.5