From 6617b16be8376d37849d483c3b19cc2834d1e1b3 Mon Sep 17 00:00:00 2001
From: Simon Caminada <simon@baker-street.ch>
Date: Mon, 21 May 2018 20:01:44 +0200
Subject: [PATCH] back to whoosh

---
 docker-compose.yml | 26 --------------------------
 requirements.in    |  2 +-
 settings.py        |  8 ++++----
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d8976fb..ba80bf3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,6 @@ services:
     build: "."
     links:
       - "db:postgres"
-      - "solr:solr"
     ports:
       - "8009:80"
     volumes:
@@ -13,9 +12,6 @@ services:
       - "./data:/data:rw"
     command: python manage.py runserver 0.0.0.0:80
     env_file: .env-local
-    networks:
-      - privatenetwork
-
 
   db:
     image: postgres:9.6-alpine
@@ -23,25 +19,3 @@ services:
       POSTGRES_DB: "db"
     volumes:
       - ".:/app:rw"
-    networks:
-      - privatenetwork
-
-  solr:
-    image: solr:7.2-alpine
-    ulimits:
-      memlock:
-        soft: 20480
-        hard: 20480
-    environment:
-      - "SOLR_HEAP=24m"
-    volumes:
-      - "./schema_de.xml:/opt/solr/server/solr/de/schema.xml"
-      - "./schema_en.xml:/opt/solr/server/solr/en/schema.xml"
-    expose:
-      - "8983"
-    networks:
-      - privatenetwork
-
-
-networks:
-  privatenetwork:
diff --git a/requirements.in b/requirements.in
index 57312a1..c323866 100644
--- a/requirements.in
+++ b/requirements.in
@@ -11,7 +11,7 @@ https://control.divio.com/api/v1/apps/serve/djangocms-picture/2.0.6/005e8663-d1c
 https://control.divio.com/api/v1/apps/serve/djangocms-text-ckeditor/3.5.3/a7b5179f-cea5-4af8-b235-6b7f709c4e6a/djangocms-text-ckeditor-3.5.3.tar.gz#egg=djangocms-text-ckeditor==3.5.3
 https://control.divio.com/api/v1/apps/serve/django-filer/1.3.0.1/bcb7d25b-6922-48a9-a252-9bc165f6403e/django-filer-1.3.0.1.tar.gz#egg=django-filer==1.3.0.1
 # </INSTALLED_ADDONS>
-pysolr==3.7.0
+Whoosh==2.7.4
 django-haystack==2.7.0
 aldryn-search==0.5.0
 django-fontawesome==0.3.1
diff --git a/settings.py b/settings.py
index 5e9dd40..ed95e15 100644
--- a/settings.py
+++ b/settings.py
@@ -59,15 +59,15 @@ HAYSTACK_CUSTOM_HIGHLIGHTER = 'project.search.Highlighter'
 HAYSTACK_DEFAULT_OPERATOR = 'OR'
 HAYSTACK_CONNECTIONS = {
     'default': {
-        'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
-        'URL': 'http://localhost:8983/solr/de/',
+        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(os.path.dirname(__file__), 'data', 'whoosh', 'default'),
     },
 }
 for lang_code, lang in LANGUAGES:
     HAYSTACK_CONNECTIONS[lang_code] = {}
     HAYSTACK_CONNECTIONS[lang_code].update({
-        'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
-        'URL': 'http://localhost:8983/solr/{}'.format(lang_code),
+        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(os.path.dirname(__file__), 'data', 'whoosh', lang_code),
     })
 
 HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter', ]