remove haystack search

6 files changed, 0 insertions, 28 deletions

diff --git a/program/search_indexes.py b/program/search_indexes.py
deleted file mode 100644
index 4b0cf74..0000000
--- a/program/search_indexes.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from haystack.indexes import CharField, SearchIndex
-from haystack import site
-
-from models import Note, Show
-
-class NoteIndex(SearchIndex):
-    SearchableText = CharField(document=True, use_template=True)
-
-class ShowIndex(SearchIndex):
-    SearchableText = CharField(document=True, use_template=True)
-
-site.register(Note, NoteIndex)
-site.register(Show, ShowIndex)
diff --git a/requirements.txt b/requirements.txt
index 68cb1af..f22e9ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,5 @@ Django==1.2.5
 MySQL-python==1.2.3
 PIL==1.1.7
 PyYAML==3.09
-django-haystack==1.2.4
 django-tinymce==1.5.1a2
-pysolr==2.0.14
 python-dateutil==1.5
diff --git a/search_sites.py b/search_sites.py
deleted file mode 100644
index e8d4e13..0000000
--- a/search_sites.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import haystack
-haystack.autodiscover()
diff --git a/settings.py b/settings.py
index ed98688..4cefed6 100644
--- a/settings.py
+++ b/settings.py
@@ -68,15 +68,9 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'program',
     'nop',
-    'haystack',
     'tinymce',
 )
 
-HAYSTACK_SITECONF = 'search_sites'
-HAYSTACK_SEARCH_ENGINE = 'solr'
-HAYSTACK_SOLR_URL = 'http://localhost:8988/solr'
-HAYSTACK_ID_FIELD = 'docid'
-
 TINYMCE_DEFAULT_CONFIG = {
     'plugins' : 'contextmenu',
     'theme': 'advanced',
diff --git a/templates/search/indexes/program/note_SearchableText.txt b/templates/search/indexes/program/note_SearchableText.txt
deleted file mode 100644
index 2421b4f..0000000
--- a/templates/search/indexes/program/note_SearchableText.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ object.title }}
-{{ object.content }}
\ No newline at end of file
diff --git a/templates/search/indexes/program/show_SearchableText.txt b/templates/search/indexes/program/show_SearchableText.txt
deleted file mode 100644
index f08b515..0000000
--- a/templates/search/indexes/program/show_SearchableText.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ object.name }}
-{{ object.description }}
-{{ object.short_description }}
\ No newline at end of file