Changed sets to shelfs.

[wolnelektury.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index 11d1aa7..0d3df16 100644 (file)
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -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',)


@@ -73,7 +73,7 @@ class Book(models.Model):
     slug = models.SlugField(_('slug'), unique=True, db_index=True)
     description = models.TextField(_('description'), blank=True)
     created_at = models.DateTimeField(_('creation date'), auto_now=True)
     slug = models.SlugField(_('slug'), unique=True, db_index=True)
     description = models.TextField(_('description'), blank=True)
     created_at = models.DateTimeField(_('creation date'), auto_now=True)

-    _short_html = models.TextField(_('short HTML'))
+    _short_html = models.TextField(_('short HTML'), editable=False)

     
     # Formats
     xml_file = models.FileField(_('XML file'), upload_to='books/xml', blank=True)
     
     # Formats
     xml_file = models.FileField(_('XML file'), upload_to='books/xml', blank=True)


@@ -129,7 +129,9 @@ class Book(models.Model):
         from tempfile import NamedTemporaryFile
         from slughifi import slughifi
         import dcparser
         from tempfile import NamedTemporaryFile
         from slughifi import slughifi
         import dcparser

+        from markupstring import MarkupString

         
         

+        # Read book metadata

         book_info = dcparser.parse(xml_file)
         book = Book(title=book_info.title, slug=slughifi(book_info.title))
         book.save()
         book_info = dcparser.parse(xml_file)
         book = Book(title=book_info.title, slug=slughifi(book_info.title))
         book.save()


@@ -158,8 +160,11 @@ class Book(models.Model):
         closed_fragments, open_fragments = html.extract_fragments(book.html_file.path)
         book_themes = []
         for fragment in closed_fragments.values():
         closed_fragments, open_fragments = html.extract_fragments(book.html_file.path)
         book_themes = []
         for fragment in closed_fragments.values():

-            new_fragment = Fragment(html=fragment.to_string(), short_html=fragment.to_string(),
-                anchor=fragment.id, book=book)
+            text = fragment.to_string()
+            short_text = ''
+            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(',')]
             themes = []
                 
             theme_names = [s.strip() for s in fragment.themes.split(',')]
             themes = []


@@ -190,14 +195,27 @@ class Book(models.Model):
 
 
 class Fragment(models.Model):
 
 
 class Fragment(models.Model):

-    html = models.TextField()
-    short_html = models.TextField()
+    text = models.TextField()
+    short_text = models.TextField(editable=False)
+    _short_html = models.TextField(editable=False)

     anchor = models.IntegerField()
     book = models.ForeignKey(Book, related_name='fragments')
     anchor = models.IntegerField()
     book = models.ForeignKey(Book, related_name='fragments')

-    
+

     objects = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)
     
     objects = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)
     

+    def short_html(self):
+        if len(self._short_html):
+            return mark_safe(self._short_html)
+        else:
+            book_authors = [u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name) 
+                for tag in self.book.tags if tag.category == 'author']
+            
+            self._short_html = render_to_string('catalogue/fragment_short.html',
+                {'fragment': self, 'book': self.book, 'book_authors': book_authors})
+            self.save()
+            return mark_safe(self._short_html)
+        

     class Meta:
         ordering = ('book', 'anchor',)
         verbose_name = _('fragment')
     class Meta:
         ordering = ('book', 'anchor',)
         verbose_name = _('fragment')