X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/7dd21f50786ef999aa6ccdc1a2ffc3a1caf5c85c..45b0231e99c7f53d29bc3b07a2ce2a0957058265:/catalogue/models.py diff --git a/catalogue/models.py b/catalogue/models.py index 11d1aa77e..c82cf4356 100644 --- 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) - _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) @@ -129,7 +129,10 @@ class Book(models.Model): 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) book = Book(title=book_info.title, slug=slughifi(book_info.title)) book.save() @@ -158,8 +161,11 @@ class Book(models.Model): 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(re.sub(r'', '', 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 = [] @@ -190,14 +196,27 @@ class Book(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') - + 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'%s' % (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')