Receipts update.

[wolnelektury.git] / src / dictionary / models.py

diff --git a/src/dictionary/models.py b/src/dictionary/models.py
index 7df6ddc..d395b23 100644 (file)
--- a/src/dictionary/models.py
+++ b/src/dictionary/models.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # 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.
 #


@@ -19,7 +18,7 @@ class Qualifier(models.Model):
     class Meta:
         ordering = ['qualifier']
 
     class Meta:
         ordering = ['qualifier']
 

-    def __unicode__(self):
+    def __str__(self):

         return self.name or self.qualifier
 
 
         return self.name or self.qualifier
 
 


@@ -37,8 +36,8 @@ class Note(models.Model):
 
 class NoteSource(models.Model):
     """Represents a single annotation from a book."""
 
 class NoteSource(models.Model):
     """Represents a single annotation from a book."""

-    note = models.ForeignKey(Note)
-    book = models.ForeignKey(Book)
+    note = models.ForeignKey(Note, models.CASCADE)
+    book = models.ForeignKey(Book, models.CASCADE)

     anchor = models.CharField(max_length=64)
 
     class Meta:
     anchor = models.CharField(max_length=64)
 
     class Meta:


@@ -47,6 +46,8 @@ class NoteSource(models.Model):
 
 @task(ignore_result=True)
 def build_notes(book):
 
 @task(ignore_result=True)
 def build_notes(book):

+    if not book.findable:
+        return

     task_logger.info(book.slug)
     with transaction.atomic():
         book.notesource_set.all().delete()
     task_logger.info(book.slug)
     with transaction.atomic():
         book.notesource_set.all().delete()


@@ -69,7 +70,6 @@ def build_notes(book):
                         fn_type=fn_type,
                         language=language
                         )
                         fn_type=fn_type,
                         language=language
                         )

-

                 qualifier_objects = []
                 for qualifier in qualifiers:
                     obj, created = Qualifier.objects.get_or_create(
                 qualifier_objects = []
                 for qualifier in qualifiers:
                     obj, created = Qualifier.objects.get_or_create(


@@ -77,12 +77,13 @@ def build_notes(book):
                             'name': FN_QUALIFIERS.get(qualifier, '')
                         })
                     qualifier_objects.append(obj)
                             'name': FN_QUALIFIERS.get(qualifier, '')
                         })
                     qualifier_objects.append(obj)

-                note.qualifiers = qualifier_objects
+                note.qualifiers.set(qualifier_objects)

                 note.notesource_set.create(book=book, anchor=anchor)
 
         Note.objects.filter(notesource=None).delete()
 
 
 def notes_from_book(sender, instance, **kwargs):
                 note.notesource_set.create(book=book, anchor=anchor)
 
         Note.objects.filter(notesource=None).delete()
 
 
 def notes_from_book(sender, instance, **kwargs):

-    build_notes.delay(instance)
+    if instance.findable:
+        build_notes.delay(instance)

 Book.html_built.connect(notes_from_book)
 Book.html_built.connect(notes_from_book)