Remove stale indexing bits.

diff --git a/apps/catalogue/models/listeners.py b/apps/catalogue/models/listeners.py
index cb10616..788957e 100644 (file)
--- a/apps/catalogue/models/listeners.py
+++ b/apps/catalogue/models/listeners.py
@@ -63,9 +63,5 @@ if not settings.NO_SEARCH_INDEX:
         """ remove the book from search index, when it is deleted."""
         import search
         idx = search.Index()
         """ remove the book from search index, when it is deleted."""
         import search
         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()

diff --git a/apps/pdcounter/models.py b/apps/pdcounter/models.py
index 50eb43e..1e441ac 100644 (file)
--- a/apps/pdcounter/models.py
+++ b/apps/pdcounter/models.py
@@ -91,13 +91,8 @@ class BookStub(models.Model):
 if not settings.NO_SEARCH_INDEX:
     def update_index(sender, instance, **kwargs):
         import search
 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)

         idx = search.Index()
         idx = search.Index()

-        idx.open()
-        try:
-            idx.index_tags(instance, remove_only=not 'created' in kwargs)
-        finally:
-            idx.close()
+        idx.index_tags(instance, remove_only=not 'created' in kwargs)

     
     post_delete.connect(update_index, Author)
     post_delete.connect(update_index, BookStub)
     
     post_delete.connect(update_index, Author)
     post_delete.connect(update_index, BookStub)

diff --git a/requirements.txt b/requirements.txt
index 572251a..d6355f2 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -52,7 +52,7 @@ pyenchant
 # OAI-PMH
 pyoai
 
 # OAI-PMH
 pyoai
 

-egenix-mx-base
+## egenix-mx-base  # Doesn't play nice with mx in dist-packages.

 sunburnt
 
 django-getpaid>=1.4,<1.5
 sunburnt
 
 django-getpaid>=1.4,<1.5