only load search when needed

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 72cbeda..a49c1e5 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -27,7 +27,6 @@ from catalogue.utils import create_zip, split_tags, truncate_html_words
 from catalogue import tasks
 import re
 
-import search
 
 # Those are hard-coded here so that makemessages sees them.
 TAG_CATEGORIES = (
@@ -562,6 +561,7 @@ class Book(models.Model):
         return create_zip(paths, "%s_%s" % (self.slug, format_))
 
     def search_index(self, book_info=None, reuse_index=False, index_tags=True):
+        import search
         if reuse_index:
             idx = search.ReusableIndex()
         else:
@@ -1006,14 +1006,16 @@ def _post_save_handler(sender, instance, **kwargs):
 post_save.connect(_post_save_handler)
 
 
-@django.dispatch.receiver(post_delete, sender=Book)
-def _remove_book_from_index_handler(sender, instance, **kwargs):
-    """ remove the book from search index, when it is deleted."""
-    search.JVM.attachCurrentThread()
-    idx = search.Index()
-    idx.open(timeout=10000)  # 10 seconds timeout.
-    try:
-        idx.remove_book(instance)
-        idx.index_tags()
-    finally:
-        idx.close()
+if not settings.NO_SEARCH_INDEX:
+    @django.dispatch.receiver(post_delete, sender=Book)
+    def _remove_book_from_index_handler(sender, instance, **kwargs):
+        """ remove the book from search index, when it is deleted."""
+        import search
+        search.JVM.attachCurrentThread()
+        idx = search.Index()
+        idx.open(timeout=10000)  # 10 seconds timeout.
+        try:
+            idx.remove_book(instance)
+            idx.index_tags()
+        finally:
+            idx.close()

diff --git a/apps/pdcounter/models.py b/apps/pdcounter/models.py
index af88bdb..35cbe29 100644 (file)
--- a/apps/pdcounter/models.py
+++ b/apps/pdcounter/models.py
@@ -2,12 +2,12 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
+from django.conf import settings
 from django.db import models
 from django.db.models import permalink
 from django.utils.translation import ugettext as _
 from datetime import datetime
 from django.db.models.signals import post_save, post_delete
-import search
 
 class Author(models.Model):
     name = models.CharField(_('name'), max_length=50, db_index=True)
@@ -88,17 +88,19 @@ class BookStub(models.Model):
         return ', '.join((self.author, self.title))
 
 
-def update_index(sender, instance, **kwargs):
-    print "update pd index %s [update %s]" % (instance, 'created' in kwargs)
-    search.JVM.attachCurrentThread()
-    idx = search.Index()
-    idx.open()
-    try:
-        idx.index_tags(instance, remove_only=not 'created' in kwargs)
-    finally:
-        idx.close()
-
-post_delete.connect(update_index, Author)
-post_delete.connect(update_index, BookStub)
-post_save.connect(update_index, Author)
-post_save.connect(update_index, BookStub)
+if not settings.NO_SEARCH_INDEX:
+    def update_index(sender, instance, **kwargs):
+        import search
+        print "update pd index %s [update %s]" % (instance, 'created' in kwargs)
+        search.JVM.attachCurrentThread()
+        idx = search.Index()
+        idx.open()
+        try:
+            idx.index_tags(instance, remove_only=not 'created' in kwargs)
+        finally:
+            idx.close()
+    
+    post_delete.connect(update_index, Author)
+    post_delete.connect(update_index, BookStub)
+    post_save.connect(update_index, Author)
+    post_save.connect(update_index, BookStub)

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index 679abec..be82e3d 100644 (file)
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -62,7 +62,6 @@ INSTALLED_APPS_OUR = [
     'stats',
     'suggest',
     'picture',
-    'search',
     'social',
     'waiter',
     ]