Merge branch 'master' of ssh://git.nowoczesnapolska.org.pl:2223/~/repo/wolnelektury

[wolnelektury.git] / apps / pdcounter / models.py

diff --git a/apps/pdcounter/models.py b/apps/pdcounter/models.py
index af88bdb..1e441ac 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.
 #
 # 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
 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)
 
 class Author(models.Model):
     name = models.CharField(_('name'), max_length=50, db_index=True)


@@ -88,17 +88,13 @@ class BookStub(models.Model):
         return ', '.join((self.author, self.title))
 
 
         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:
+if not settings.NO_SEARCH_INDEX:
+    def update_index(sender, instance, **kwargs):
+        import search
+        idx = search.Index()

         idx.index_tags(instance, remove_only=not 'created' in kwargs)
         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)
+    
+    post_delete.connect(update_index, Author)
+    post_delete.connect(update_index, BookStub)
+    post_save.connect(update_index, Author)
+    post_save.connect(update_index, BookStub)