Added foreign key to parent book on Book model.

[wolnelektury.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index c82cf43..e80bd25 100644 (file)
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -10,7 +10,7 @@ from django.utils.safestring import mark_safe
 from newtagging.models import TagBase
 from newtagging import managers
 
-from librarian import html
+from librarian import html, dcparser
 
 
 TAG_CATEGORIES = (
@@ -49,7 +49,7 @@ class Tag(TagBase):
 
     @permalink
     def get_absolute_url(self):
-        return ('catalogue.views.tagged_book_list', [self.slug])
+        return ('catalogue.views.tagged_object_list', [self.slug])
     
     class Meta:
         ordering = ('sort_key',)
@@ -81,6 +81,8 @@ class Book(models.Model):
     odt_file = models.FileField(_('ODT file'), upload_to='books/odt', blank=True)
     html_file = models.FileField(_('HTML file'), upload_to='books/html', blank=True)
     
+    parent = models.ForeignKey('self', blank=True, null=True)
+    
     objects = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)
     
@@ -128,9 +130,7 @@ class Book(models.Model):
     def from_xml_file(xml_file):
         from tempfile import NamedTemporaryFile
         from slughifi import slughifi
-        import dcparser
         from markupstring import MarkupString
-        import re
         
         # Read book metadata
         book_info = dcparser.parse(xml_file)
@@ -163,7 +163,7 @@ class Book(models.Model):
         for fragment in closed_fragments.values():
             text = fragment.to_string()
             short_text = ''
-            if (len(re.sub(r'</?.*?>', '', text)) > 240):
+            if (len(MarkupString(text)) > 240):
                 short_text = MarkupString(text)[:160]
             new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book)