X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f062d83d5999fa0540aabef056fa21ef225728fd..d433a636abfc040891dde68aa9e5f81b30549134:/apps/catalogue/models.py?ds=sidebyside diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 5f4ec923c..b5970e9f1 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -6,6 +6,7 @@ from django.contrib.auth.models import User from django.core.files import File from django.template.loader import render_to_string from django.utils.safestring import mark_safe +from django.core.urlresolvers import reverse from newtagging.models import TagBase from newtagging import managers @@ -33,7 +34,7 @@ class TagSubcategoryManager(models.Manager): class Tag(TagBase): - name = models.CharField(_('name'), max_length=50, unique=True, db_index=True) + name = models.CharField(_('name'), max_length=50, db_index=True) slug = models.SlugField(_('slug'), max_length=120, unique=True, db_index=True) sort_key = models.SlugField(_('sort key'), max_length=120, db_index=True) category = models.CharField(_('category'), max_length=50, blank=False, null=False, @@ -81,6 +82,7 @@ class Book(models.Model): description = models.TextField(_('description'), blank=True) created_at = models.DateTimeField(_('creation date'), auto_now=True) _short_html = models.TextField(_('short HTML'), editable=False) + parent_number = models.IntegerField(_('parent number'), default=0) # Formats xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True) @@ -104,7 +106,7 @@ class Book(models.Model): formats = [] if self.html_file: - formats.append(u'Czytaj online' % self.html_file.url) + formats.append(u'Czytaj online' % reverse('book_text', kwargs={'slug': self.slug})) if self.pdf_file: formats.append(u'Plik PDF' % self.pdf_file.url) if self.odt_file: @@ -154,49 +156,60 @@ class Book(models.Model): if category == 'author': tag_sort_key = tag_name.last_name tag_name = ' '.join(tag_name.first_names) + ' ' + tag_name.last_name - tag, created = Tag.objects.get_or_create(name=tag_name, - slug=slughifi(tag_name), sort_key=slughifi(tag_sort_key), category=category) - tag.save() + tag, created = Tag.objects.get_or_create(slug=slughifi(tag_name)) + if created: + tag.name = tag_name + tag.sort_key = slughifi(tag_sort_key) + tag.category = category + tag.save() book_tags.append(tag) book.tags = book_tags if hasattr(book_info, 'parts'): - for part_url in book_info.parts: + for n, part_url in enumerate(book_info.parts): base, slug = part_url.rsplit('/', 1) child_book = Book.objects.get(slug=slug) child_book.parent = book + child_book.parent_number = n child_book.save() # Save XML and HTML files book.xml_file.save('%s.xml' % book.slug, File(file(xml_file)), save=False) html_file = NamedTemporaryFile() - html.transform(book.xml_file.path, html_file) - book.html_file.save('%s.html' % book.slug, File(html_file), save=False) - - # Extract fragments - closed_fragments, open_fragments = html.extract_fragments(book.html_file.path) - book_themes = [] - for fragment in closed_fragments.values(): - text = fragment.to_string() - short_text = '' - if (len(MarkupString(text)) > 240): - short_text = unicode(MarkupString(text)[:160]) - new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book) + if html.transform(book.xml_file.path, html_file): + book.html_file.save('%s.html' % book.slug, File(html_file), save=False) + + # Extract fragments + closed_fragments, open_fragments = html.extract_fragments(book.html_file.path) + book_themes = [] + for fragment in closed_fragments.values(): + text = fragment.to_string() + short_text = '' + if (len(MarkupString(text)) > 240): + short_text = unicode(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 = [] - for theme_name in theme_names: - tag, created = Tag.objects.get_or_create(name=theme_name, - slug=slughifi(theme_name), sort_key=slughifi(theme_name), category='theme') - tag.save() - themes.append(tag) - new_fragment.save() - new_fragment.tags = list(book.tags) + themes - book_themes += themes + try: + theme_names = [s.strip() for s in fragment.themes.split(',')] + except AttributeError: + continue + themes = [] + for theme_name in theme_names: + tag, created = Tag.objects.get_or_create(slug=slughifi(theme_name)) + if created: + tag.name = theme_name + tag.sort_key = slughifi(theme_name) + tag.category = 'theme' + tag.save() + themes.append(tag) + new_fragment.save() + new_fragment.tags = list(book.tags) + themes + book_themes += themes + + book_themes = set(book_themes) + book.tags = list(book.tags) + list(book_themes) - book_themes = set(book_themes) - book.tags = list(book.tags) + list(book_themes) return book.save() @permalink @@ -236,7 +249,7 @@ class Fragment(models.Model): return mark_safe(self._short_html) def get_absolute_url(self): - return '%s#m%s' % (self.book.html_file.url, self.anchor) + return '%s#m%s' % (reverse('book_text', kwargs={'slug': self.book.slug}), self.anchor) class Meta: ordering = ('book', 'anchor',)