X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/83559fba0846ad77721b31231d1d807a91e52157..7fc1680165d8334dcac541883b03776082b80ad5:/catalogue/models.py?ds=sidebyside diff --git a/catalogue/models.py b/catalogue/models.py index 0d3df1603..f3f6bc2d5 100644 --- 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 librarian import html +from librarian import html, dcparser TAG_CATEGORIES = ( @@ -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) - 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): @@ -128,7 +131,6 @@ class Book(models.Model): def from_xml_file(xml_file): from tempfile import NamedTemporaryFile from slughifi import slughifi - import dcparser from markupstring import MarkupString # Read book metadata @@ -149,6 +151,13 @@ class Book(models.Model): 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) @@ -201,7 +210,8 @@ class Fragment(models.Model): 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):