fixes

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

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index bf724fd..95d3da1 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -397,6 +397,9 @@ class Book(models.Model):
         return self.get_media("daisy")                       
 
     def reset_short_html(self):
         return self.get_media("daisy")                       
 
     def reset_short_html(self):

+        if self.id is None:
+            return
+

         cache_key = "Book.short_html/%d/%s"
         for lang, langname in settings.LANGUAGES:
             cache.delete(cache_key % (self.id, lang))
         cache_key = "Book.short_html/%d/%s"
         for lang, langname in settings.LANGUAGES:
             cache.delete(cache_key % (self.id, lang))


@@ -405,14 +408,15 @@ class Book(models.Model):
             fragm.reset_short_html()
 
     def short_html(self):
             fragm.reset_short_html()
 
     def short_html(self):

-        cache_key = "Book.short_html/%d/%s" % (self.id, get_language())
-        short_html = cache.get(cache_key)
+        if self.id:
+            cache_key = "Book.short_html/%d/%s" % (self.id, get_language())
+            short_html = cache.get(cache_key)
+        else:
+            short_html = None

 
         if short_html is not None:
 
         if short_html is not None:

-            print 'b.s from cache'

             return mark_safe(short_html)
         else:
             return mark_safe(short_html)
         else:

-            print 'b.s manual'

             tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book')))
             tags = [mark_safe(u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name)) for tag in tags]
 
             tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book')))
             tags = [mark_safe(u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name)) for tag in tags]
 


@@ -434,7 +438,9 @@ class Book(models.Model):
 
             short_html = unicode(render_to_string('catalogue/book_short.html',
                 {'book': self, 'tags': tags, 'formats': formats}))
 
             short_html = unicode(render_to_string('catalogue/book_short.html',
                 {'book': self, 'tags': tags, 'formats': formats}))

-            cache.set(cache_key, short_html)
+
+            if self.id:
+                cache.set(cache_key, short_html)

             return mark_safe(short_html)
 
     @property
             return mark_safe(short_html)
 
     @property


@@ -710,6 +716,9 @@ class Book(models.Model):
         return book
 
     def reset_tag_counter(self):
         return book
 
     def reset_tag_counter(self):

+        if self.id is None:
+            return
+

         cache_key = "Book.tag_counter/%d" % self.id
         cache.delete(cache_key)
         if self.parent:
         cache_key = "Book.tag_counter/%d" % self.id
         cache.delete(cache_key)
         if self.parent:


@@ -717,11 +726,13 @@ class Book(models.Model):
 
     @property
     def tag_counter(self):
 
     @property
     def tag_counter(self):

-        cache_key = "Book.tag_counter/%d" % self.id
-        tags = cache.get(cache_key)
-        print 'tag'
+        if self.id:
+            cache_key = "Book.tag_counter/%d" % self.id
+            tags = cache.get(cache_key)
+        else:
+            tags = None
+

         if tags is None:
         if tags is None:

-            print 'tag manual'

             tags = {}
             for child in self.children.all().order_by():
                 for tag_pk, value in child.tag_counter.iteritems():
             tags = {}
             for child in self.children.all().order_by():
                 for tag_pk, value in child.tag_counter.iteritems():


@@ -729,10 +740,14 @@ class Book(models.Model):
             for tag in self.tags.exclude(category__in=('book', 'theme', 'set')).order_by():
                 tags[tag.pk] = 1
 
             for tag in self.tags.exclude(category__in=('book', 'theme', 'set')).order_by():
                 tags[tag.pk] = 1
 

-            cache.set(cache_key, tags)
+            if self.id:
+                cache.set(cache_key, tags)

         return tags
 
     def reset_theme_counter(self):
         return tags
 
     def reset_theme_counter(self):

+        if self.id is None:
+            return
+

         cache_key = "Book.theme_counter/%d" % self.id
         cache.delete(cache_key)
         if self.parent:
         cache_key = "Book.theme_counter/%d" % self.id
         cache.delete(cache_key)
         if self.parent:


@@ -740,17 +755,20 @@ class Book(models.Model):
 
     @property
     def theme_counter(self):
 
     @property
     def theme_counter(self):

-        cache_key = "Book.theme_counter/%d" % self.id
-        tags = cache.get(cache_key)
-        print 'theme'
+        if self.id:
+            cache_key = "Book.theme_counter/%d" % self.id
+            tags = cache.get(cache_key)
+        else:
+            tags = None
+

         if tags is None:
         if tags is None:

-            print 'theme manual'

             tags = {}
             for fragment in Fragment.tagged.with_any([self.book_tag()]).order_by():
                 for tag in fragment.tags.filter(category='theme').order_by():
                     tags[tag.pk] = tags.get(tag.pk, 0) + 1
 
             tags = {}
             for fragment in Fragment.tagged.with_any([self.book_tag()]).order_by():
                 for tag in fragment.tags.filter(category='theme').order_by():
                     tags[tag.pk] = tags.get(tag.pk, 0) + 1
 

-            cache.set(cache_key, tags)
+            if self.id:
+                cache.set(cache_key, tags)

         return tags
 
     def pretty_title(self, html_links=False):
         return tags
 
     def pretty_title(self, html_links=False):


@@ -808,22 +826,27 @@ class Fragment(models.Model):
         return '%s#m%s' % (reverse('book_text', kwargs={'slug': self.book.slug}), self.anchor)
 
     def reset_short_html(self):
         return '%s#m%s' % (reverse('book_text', kwargs={'slug': self.book.slug}), self.anchor)
 
     def reset_short_html(self):

+        if self.id is None:
+            return
+

         cache_key = "Fragment.short_html/%d/%s"
         for lang, langname in settings.LANGUAGES:
             cache.delete(cache_key % (self.id, lang))
 
     def short_html(self):
         cache_key = "Fragment.short_html/%d/%s"
         for lang, langname in settings.LANGUAGES:
             cache.delete(cache_key % (self.id, lang))
 
     def short_html(self):

-        cache_key = "Fragment.short_html/%d/%s" % (self.id, get_language())
-        short_html = cache.get(cache_key)
+        if self.id:
+            cache_key = "Fragment.short_html/%d/%s" % (self.id, get_language())
+            short_html = cache.get(cache_key)
+        else:
+            short_html = None

 
         if short_html is not None:
 
         if short_html is not None:

-            print 'f.s from cache'

             return mark_safe(short_html)
         else:
             return mark_safe(short_html)
         else:

-            print 'f.s manual'

             short_html = unicode(render_to_string('catalogue/fragment_short.html',
                 {'fragment': self}))
             short_html = unicode(render_to_string('catalogue/fragment_short.html',
                 {'fragment': self}))

-            cache.set(cache_key, short_html)
+            if self.id:
+                cache.set(cache_key, short_html)

             return mark_safe(short_html)
 
 
             return mark_safe(short_html)