X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/5eeb9dace6068f83e2b70b5222cfab0c0a5e71eb..0bd2f26c7d4a349bf9ae9377a945baf39d28af00:/apps/pdcounter/models.py diff --git a/apps/pdcounter/models.py b/apps/pdcounter/models.py index af88bdb09..7c10f1e59 100644 --- 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 django.utils.translation import ugettext_lazy 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,13 @@ 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: +if not settings.NO_SEARCH_INDEX: + def update_index(sender, instance, **kwargs): + from search.index import Index + idx = Index() 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)