limited stopwords + better search by author + remove descendant results

[wolnelektury.git] / src / catalogue / models / book.py

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
index cdb1100..0f664c4 100644 (file)
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@ -42,7 +42,8 @@ class UploadToPath(object):
 
 _cover_upload_to = UploadToPath('book/cover/%s.jpg')
 _cover_thumb_upload_to = UploadToPath('book/cover_thumb/%s.jpg')
 
 _cover_upload_to = UploadToPath('book/cover/%s.jpg')
 _cover_thumb_upload_to = UploadToPath('book/cover_thumb/%s.jpg')

-_cover_api_thumb_opload_to = UploadToPath('book/cover_api_thumb/%s.jpg')
+_cover_api_thumb_upload_to = UploadToPath('book/cover_api_thumb/%s.jpg')
+_simple_cover_upload_to = UploadToPath('book/cover_simple/%s.jpg')

 
 
 def _ebook_upload_to(upload_path):
 
 
 def _ebook_upload_to(upload_path):


@@ -81,9 +82,14 @@ class Book(models.Model):
         upload_to=_cover_thumb_upload_to,
         max_length=255)
     cover_api_thumb = EbookField(
         upload_to=_cover_thumb_upload_to,
         max_length=255)
     cover_api_thumb = EbookField(

-        'cover_api_thumb', _('cover thumbnail for API'),
+        'cover_api_thumb', _('cover thumbnail for mobile app'),

         null=True, blank=True,
         null=True, blank=True,

-        upload_to=_cover_api_thumb_opload_to,
+        upload_to=_cover_api_thumb_upload_to,
+        max_length=255)
+    simple_cover = EbookField(
+        'simple_cover', _('cover for mobile app'),
+        null=True, blank=True,
+        upload_to=_simple_cover_upload_to,

         max_length=255)
     ebook_formats = constants.EBOOK_FORMATS
     formats = ebook_formats + ['html', 'xml']
         max_length=255)
     ebook_formats = constants.EBOOK_FORMATS
     formats = ebook_formats + ['html', 'xml']


@@ -440,6 +446,7 @@ class Book(models.Model):
             book.cover.build_delay()
             book.cover_thumb.build_delay()
             book.cover_api_thumb.build_delay()
             book.cover.build_delay()
             book.cover_thumb.build_delay()
             book.cover_api_thumb.build_delay()

+            book.simple_cover.build_delay()

 
         # Build HTML and ebooks.
         book.html_file.build_delay()
 
         # Build HTML and ebooks.
         book.html_file.build_delay()


@@ -543,6 +550,7 @@ class Book(models.Model):
                 self.cover.build_delay()
                 self.cover_thumb.build_delay()
                 self.cover_api_thumb.build_delay()
                 self.cover.build_delay()
                 self.cover_thumb.build_delay()
                 self.cover_api_thumb.build_delay()

+                self.simple_cover.build_delay()

             for format_ in constants.EBOOK_FORMATS_WITH_COVERS:
                 if format_ not in app_settings.DONT_BUILD:
                     getattr(self, '%s_file' % format_).build_delay()
             for format_ in constants.EBOOK_FORMATS_WITH_COVERS:
                 if format_ not in app_settings.DONT_BUILD:
                     getattr(self, '%s_file' % format_).build_delay()