Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

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

diff --git a/apps/dictionary/models.py b/apps/dictionary/models.py
index c0a92d1..1d2fbba 100644 (file)
--- a/apps/dictionary/models.py
+++ b/apps/dictionary/models.py
@@ -4,7 +4,6 @@
 #
 from django.db import models
 
-from librarian import html
 from sortify import sortify
 
 from catalogue.models import Book
@@ -21,10 +20,14 @@ class Note(models.Model):
 
 
 def notes_from_book(sender, **kwargs):
+    from librarian import html
+
     Note.objects.filter(book=sender).delete()
-    if sender.has_html_file:
+    if sender.html_file:
         for anchor, text_str, html_str in html.extract_annotations(sender.html_file.path):
             Note.objects.create(book=sender, anchor=anchor,
-                               html=html_str, sort_key=sortify(text_str)[:128])
+                               html=html_str, 
+                               sort_key=sortify(text_str).strip()[:128])
 
+# always re-extract notes after making a HTML in a Book
 Book.html_built.connect(notes_from_book)