Remove stale indexing bits.

[wolnelektury.git] / apps / catalogue / models / listeners.py

diff --git a/apps/catalogue/models/listeners.py b/apps/catalogue/models/listeners.py
index e1299ab..788957e 100644 (file)
--- a/apps/catalogue/models/listeners.py
+++ b/apps/catalogue/models/listeners.py
@@ -44,15 +44,16 @@ def _post_save_handler(sender, instance, **kwargs):
     """ refresh all the short_html stuff on BookMedia update """
     if sender == BookMedia:
         instance.book.save()
-        permanent_cache.delete('catalogue.audiobook_list')
+        permanent_cache.delete_many([
+            'catalogue.audiobook_list', 'catalogue.daisy_list'])
     elif sender == Collection:
         permanent_cache.delete('catalogue.collection:%s' % instance.slug)
 post_save.connect(_post_save_handler)
 
 
 def post_publish(sender, **kwargs):
-    permanent_cache.delete_many(['catalogue.book_list',
-        'catalogue.daisy_list'])
+    permanent_cache.delete('catalogue.book_list')
+    permanent_cache.delete('catalogue.catalogue')
 Book.published.connect(post_publish)
 
 
@@ -61,11 +62,6 @@ if not settings.NO_SEARCH_INDEX:
     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()
+        idx.remove_book(instance)
+        idx.index_tags()