Renamed ModelTagManager on Book and Fragment models to tagged and added new default...

[wolnelektury.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index e9c8928..f3f6bc2 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 newtagging.models import TagBase
 from newtagging import managers
 

-from librarian import html
+from librarian import html, dcparser

 
 
 TAG_CATEGORIES = (
 
 
 TAG_CATEGORIES = (


@@ -49,7 +49,7 @@ class Tag(TagBase):
 
     @permalink
     def get_absolute_url(self):
 
     @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',)
     
     class Meta:
         ordering = ('sort_key',)


@@ -81,7 +81,10 @@ 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)
     
     odt_file = models.FileField(_('ODT file'), upload_to='books/odt', blank=True)
     html_file = models.FileField(_('HTML file'), upload_to='books/html', blank=True)
     

-    objects = managers.ModelTaggedItemManager(Tag)
+    parent = models.ForeignKey('self', blank=True, null=True, related_name='children')
+    
+    objects = models.Manager()
+    tagged = managers.ModelTaggedItemManager(Tag)

     tags = managers.TagDescriptor(Tag)
     
     def short_html(self):
     tags = managers.TagDescriptor(Tag)
     
     def short_html(self):


@@ -128,9 +131,7 @@ class Book(models.Model):
     def from_xml_file(xml_file):
         from tempfile import NamedTemporaryFile
         from slughifi import slughifi
     def from_xml_file(xml_file):
         from tempfile import NamedTemporaryFile
         from slughifi import slughifi

-        import dcparser

         from markupstring import MarkupString
         from markupstring import MarkupString

-        import re

         
         # Read book metadata
         book_info = dcparser.parse(xml_file)
         
         # Read book metadata
         book_info = dcparser.parse(xml_file)


@@ -150,6 +151,13 @@ class Book(models.Model):
             book_tags.append(tag)
         book.tags = book_tags
         
             book_tags.append(tag)
         book.tags = book_tags
         

+        if hasattr(book_info, 'parts'):
+            for part_url in book_info.parts:
+                base, slug = part_url.rsplit('/', 1)
+                child_book = Book.objects.get(slug=slug)
+                child_book.parent = book
+                child_book.save()
+        

         # Save XML and HTML files
         book.xml_file.save('%s.xml' % book.slug, File(file(xml_file)), save=False)
         
         # Save XML and HTML files
         book.xml_file.save('%s.xml' % book.slug, File(file(xml_file)), save=False)
         


@@ -163,8 +171,8 @@ class Book(models.Model):
         for fragment in closed_fragments.values():
             text = fragment.to_string()
             short_text = ''
         for fragment in closed_fragments.values():
             text = fragment.to_string()
             short_text = ''

-            if (len(re.sub(r'</?.*?>', '', text)) > 400):
-                short_text = MarkupString(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)
                 
             theme_names = [s.strip() for s in fragment.themes.split(',')]
             new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book)
                 
             theme_names = [s.strip() for s in fragment.themes.split(',')]


@@ -202,7 +210,8 @@ class Fragment(models.Model):
     anchor = models.IntegerField()
     book = models.ForeignKey(Book, related_name='fragments')
 
     anchor = models.IntegerField()
     book = models.ForeignKey(Book, related_name='fragments')
 

-    objects = managers.ModelTaggedItemManager(Tag)
+    objects = models.Manager()
+    tagged = managers.ModelTaggedItemManager(Tag)

     tags = managers.TagDescriptor(Tag)
     
     def short_html(self):
     tags = managers.TagDescriptor(Tag)
     
     def short_html(self):