Added markupstring to lib folder.

[wolnelektury.git] / catalogue / models.py

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


@@ -130,6 +130,7 @@ class Book(models.Model):
         from slughifi import slughifi
         import dcparser
         
         from slughifi import slughifi
         import dcparser
         

+        # 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 +159,7 @@ 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)
+            new_fragment = Fragment(html=fragment.to_string(), 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 = []


@@ -191,13 +191,25 @@ class Book(models.Model):
 
 class Fragment(models.Model):
     html = models.TextField()
 
 class Fragment(models.Model):
     html = models.TextField()

-    short_html = models.TextField()
+    _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')