From ed20fe9aabacabc81232e58bed2372124e538afa Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 13 Oct 2010 13:25:34 +0200 Subject: [PATCH] fixes #854: republish a book with parent correctly --- apps/catalogue/models.py | 19 ++++++++++--- apps/catalogue/tests/book_import.py | 43 +++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 6863b2a40..e692ad8c5 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -449,10 +449,20 @@ class Book(models.Model): # Save XML and HTML files book.xml_file.save('%s.xml' % book.slug, raw_file, save=False) + # delete old fragments when overwriting + book.fragments.all().delete() + html_file = NamedTemporaryFile() if html.transform(book.xml_file.path, html_file, parse_dublincore=False): book.html_file.save('%s.html' % book.slug, File(html_file), save=False) + # get ancestor l-tags for adding to new fragments + ancestor_tags = [] + p = book.parent + while p: + ancestor_tags.append(p.book_tag()) + p = p.parent + # Extract fragments closed_fragments, open_fragments = html.extract_fragments(book.html_file.path) for fragment in closed_fragments.values(): @@ -481,9 +491,10 @@ class Book(models.Model): defaults={'text': text, 'short_text': short_text}) new_fragment.save() - new_fragment.tags = set(book_tags + themes + [book_tag]) + new_fragment.tags = set(book_tags + themes + [book_tag] + ancestor_tags) - book.build_epub(remove_descendants=False) + if not book.parent: + book.build_epub(remove_descendants=False) book_descendants = list(book.children.all()) # add l-tag to descendants and their fragments @@ -499,8 +510,8 @@ class Book(models.Model): book_descendants += list(child_book.children.all()) # refresh cache - book.tag_counter - book.theme_counter + book.reset_tag_counter() + book.reset_theme_counter() book.save() return book diff --git a/apps/catalogue/tests/book_import.py b/apps/catalogue/tests/book_import.py index cb63fc069..f22be327f 100644 --- a/apps/catalogue/tests/book_import.py +++ b/apps/catalogue/tests/book_import.py @@ -153,3 +153,46 @@ class BookImportLogicTests(WLTestCase): tags.sort() self.assertEqual(tags, self.expected_tags) + + +class ChildImportTests(WLTestCase): + + def setUp(self): + WLTestCase.setUp(self) + self.child_info = BookInfoStub( + genre='X-Genre', + epoch='X-Epoch', + kind='X-Kind', + author=PersonStub(("Joe",), "Doe"), + **info_args("Child") + ) + + self.parent_info = BookInfoStub( + genre='X-Genre', + epoch='X-Epoch', + kind='X-Kind', + author=PersonStub(("Jim",), "Lazy"), + parts=[self.child_info.url], + **info_args("Parent") + ) + + def test_child_replace(self): + PARENT_TEXT = """""" + CHILD_TEXT = """ + + PiesAla ma kota + + """ + child = models.Book.from_text_and_meta(ContentFile(CHILD_TEXT), self.child_info) + parent = models.Book.from_text_and_meta(ContentFile(PARENT_TEXT), self.parent_info) + CHILD_TEXT = """ + + KotAla ma kota + + """ + child = models.Book.from_text_and_meta(ContentFile(CHILD_TEXT), self.child_info, overwrite=True) + + themes = self.client.get(parent.get_absolute_url()).context['book_themes'] + + self.assertEqual(['Kot'], [tag.name for tag in themes], + 'wrong related theme list') -- 2.20.1