Added branch 1.0.

[wolnelektury.git] / apps / catalogue / models.py

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index ec3c32e..9d072b4 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -10,6 +10,7 @@ from django.core.urlresolvers import reverse
 
 from newtagging.models import TagBase
 from newtagging import managers
+import djangosphinx
 
 from librarian import html, dcparser
 
@@ -43,7 +44,9 @@ class Tag(TagBase):
     main_page = models.BooleanField(_('main page'), default=False, db_index=True, help_text=_('Show tag on main page'))
         
     user = models.ForeignKey(User, blank=True, null=True)
-    book_count = models.IntegerField(_('book count'))
+    book_count = models.IntegerField(_('book count'), default=0, blank=False, null=False)
+    
+    search = djangosphinx.SphinxSearch()
     
     def has_description(self):
         return len(self.description) > 0
@@ -97,6 +100,8 @@ class Book(models.Model):
     objects = models.Manager()
     tagged = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)
+
+    search = djangosphinx.SphinxSearch()
     
     @property
     def name(self):
@@ -157,8 +162,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 = list(book.tags.filter(category='set'))
         
         book.title = book_info.title
         book._short_html = ''
@@ -224,7 +235,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) + book_shelves
         
         book.save()
         return book
@@ -253,6 +264,8 @@ class Fragment(models.Model):
     tagged = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)
     
+    search = djangosphinx.SphinxSearch()
+    
     def short_html(self):
         if len(self._short_html):
             return mark_safe(self._short_html)