From: Marek Stępniowski Date: Mon, 29 Sep 2008 13:22:49 +0000 (+0200) Subject: Save shelves for each book during reimport. X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/96ffe46ed194b842c5df711fd0135d51655b880d?ds=inline;hp=a426e3eefad0d817660f7770f5fd425511c37e47 Save shelves for each book during reimport. --- diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 8a7722749..18e7e804d 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -157,8 +157,14 @@ class Book(models.Model): book_info = dcparser.parse(xml_file) book_base, book_slug = book_info.url.rsplit('/', 1) book, created = Book.objects.get_or_create(slug=book_slug) - if not created and not overwrite: - raise Book.AlreadyExists('Book %s already exists' % book_slug) + + if created: + book_shelves = [] + else: + if not overwrite: + raise Book.AlreadyExists('Book %s already exists' % book_slug) + # Save shelves for this book + book_shelves = book.tags.filter(category='set') book.title = book_info.title book._short_html = '' @@ -224,7 +230,7 @@ class Book(models.Model): book_themes += themes book_themes = set(book_themes) - book.tags = list(book.tags) + list(book_themes) + book.tags = list(book.tags) + list(book_themes) + list(book_shelves) book.save() return book