From 898eca9738134668981cbadcd9e0f0b9585b8fc8 Mon Sep 17 00:00:00 2001
From: Simon Caminada <simon@baker-street.ch>
Date: Tue, 3 Apr 2018 19:17:59 +0200
Subject: [PATCH] back to whoosh

---
 docker-compose.yml | 39 ++++++++++++++++++++-------------------
 requirements.in    |  1 +
 settings.py        | 28 ++++++++++++++++------------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 82b418f..0b21a2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,12 +5,13 @@ services:
     build: "."
     links:
       - "db:postgres"
-      - "es:es"
+#      - "es:es"
     ports:
       - "8009:80"
     volumes:
       - ".:/app:rw"
       - "./data:/data:rw"
+      - "./whoosh:/usr/share/whoosh/data:rw"
     command: python manage.py runserver 0.0.0.0:80
     env_file: .env-local
 
@@ -21,21 +22,21 @@ services:
     volumes:
       - ".:/app:rw"
 
-  es:
-    image: elasticsearch:2.4-alpine
-    ulimits:
-      memlock:
-        soft: 10240
-        hard: 10240
-    environment:
-      - "ES_JAVA_OPTS=-server -Xms14m -Xmx14m"
-      - "ES_HEAP_SIZE=14m"
-      - "MAX_LOCKED_MEMORY=10240"
-      - index.number_of_shards=1
-      - index.number_of_replicas=0
-      - network.tcp.block=1
-      - bootstrap.memory_lock=1
-    volumes:
-      - "./esdata:/usr/share/elasticsearch/data:rw"
-    expose:
-      - "9200"
+#  es:
+#    image: elasticsearch:2.4-alpine
+#    ulimits:
+#      memlock:
+#        soft: 5120
+#        hard: 5120
+#    environment:
+#      - "ES_JAVA_OPTS=-server -Xms10m -Xmx10m"
+#      - "ES_HEAP_SIZE=10m"
+#      - "MAX_LOCKED_MEMORY=5120"
+#      - index.number_of_shards=1
+#      - index.number_of_replicas=0
+#      - network.tcp.block=1
+#      - bootstrap.memory_lock=1
+#    volumes:
+#      - "./esdata:/usr/share/elasticsearch/data:rw"
+#    expose:
+#      - "9200"
diff --git a/requirements.in b/requirements.in
index f0088d8..55ba34f 100644
--- a/requirements.in
+++ b/requirements.in
@@ -12,6 +12,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>
+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 9480920..3115880 100644
--- a/settings.py
+++ b/settings.py
@@ -10,7 +10,6 @@ INSTALLED_ADDONS = [
     'aldryn-django-cms',
     'aldryn-forms',
     'aldryn-google-analytics',
-    'aldryn-haystack',
     'djangocms-history',
     'djangocms-link',
     'djangocms-picture',
@@ -29,6 +28,7 @@ INSTALLED_APPS.extend([
     'portal',
     'project',
     'fontawesome',
+    'haystack',
     'aldryn_search',
     'spurl',
     'image_cropping',
@@ -57,17 +57,21 @@ ALDRYN_SEARCH_INDEX_BASE_CLASS = 'project.search.SearchIndex'
 
 HAYSTACK_CUSTOM_HIGHLIGHTER = 'project.search.Highlighter'
 HAYSTACK_DEFAULT_OPERATOR = 'OR'
-
-if DEFAULT_HAYSTACK_URL:
-    from aldryn_haystack import haystack_url
-
-    HAYSTACK_CONNECTIONS = haystack_url.parse_i18n(
-        url=DEFAULT_HAYSTACK_URL,
-        language_codes=[lang[0] for lang in LANGUAGES],
-        default_language_code=LANGUAGE_CODE,
-    )
-
-HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter']
+HAYSTACK_INDEX_PATH = os.path.join('/usr/share/whoosh/data', 'index')
+HAYSTACK_CONNECTIONS = {
+    'default': {
+        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(HAYSTACK_INDEX_PATH, 'default'),
+    },
+}
+for lang_code, lang in LANGUAGES:
+    HAYSTACK_CONNECTIONS[lang_code] = {}
+    HAYSTACK_CONNECTIONS[lang_code].update({
+        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(HAYSTACK_INDEX_PATH, lang_code),
+    })
+
+HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter', ]
 
 CMS_TEMPLATE_INHERITANCE = False