Preliminary math and tables support.

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

diff --git a/apps/pdcounter/models.py b/apps/pdcounter/models.py
index 35cbe29..7c10f1e 100644 (file)
--- a/apps/pdcounter/models.py
+++ b/apps/pdcounter/models.py
@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.db import models
 from django.db.models import permalink
 from django.conf import settings
 from django.db import models
 from django.db.models import permalink

-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _

 from datetime import datetime
 from django.db.models.signals import post_save, post_delete
 
 from datetime import datetime
 from django.db.models.signals import post_save, post_delete
 


@@ -90,16 +90,10 @@ class BookStub(models.Model):
 
 if not settings.NO_SEARCH_INDEX:
     def update_index(sender, instance, **kwargs):
 
 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()
-    
+        from search.index import Index
+        idx = Index()
+        idx.index_tags(instance, remove_only=not 'created' in kwargs)
+

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