Minor fix in OAI-PMH.

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

diff --git a/apps/chunks/models.py b/apps/chunks/models.py
index 5cdf8fe..7f5410b 100644 (file)
--- a/apps/chunks/models.py
+++ b/apps/chunks/models.py
@@ -1,6 +1,7 @@
-from django.core.cache import cache
+from django.conf import settings

 from django.db import models
 from django.db import models

-from django.utils.translation import ugettext_lazy as _, get_language
+from django.utils.translation import ugettext_lazy as _
+from ssify import flush_ssi_includes

 
 
 class Chunk(models.Model):
 
 
 class Chunk(models.Model):


@@ -9,8 +10,8 @@ class Chunk(models.Model):
     any template with the use of a special template tag.
     """
     key = models.CharField(_('key'), help_text=_('A unique name for this chunk of content'), primary_key=True, max_length=255)
     any template with the use of a special template tag.
     """
     key = models.CharField(_('key'), help_text=_('A unique name for this chunk of content'), primary_key=True, max_length=255)

-    description = models.CharField(_('description'), blank=True, null=True, max_length=255)
-    content = models.TextField(_('content'), blank=True, null=True)
+    description = models.CharField(_('description'), blank=True, max_length=255)
+    content = models.TextField(_('content'), blank=True)

 
     class Meta:
         ordering = ('key',)
 
     class Meta:
         ordering = ('key',)


@@ -20,15 +21,17 @@ class Chunk(models.Model):
     def __unicode__(self):
         return self.key
 
     def __unicode__(self):
         return self.key
 

-    @staticmethod
-    def cache_key(key):
-        return 'chunk/%s/%s' % (key, get_language())
-

     def save(self, *args, **kwargs):
         ret = super(Chunk, self).save(*args, **kwargs)
     def save(self, *args, **kwargs):
         ret = super(Chunk, self).save(*args, **kwargs)

-        cache.delete(self.cache_key(self.key))
+        self.flush_includes()

         return ret
 
         return ret
 

+    def flush_includes(self):
+        flush_ssi_includes([
+            '/chunks/chunk/%s.%s.html' % (self.key, lang)
+            for lang in [lc for (lc, _ln) in settings.LANGUAGES]])
+
+

 
 class Attachment(models.Model):
     key = models.CharField(_('key'), help_text=_('A unique name for this attachment'), primary_key=True, max_length=255)
 
 class Attachment(models.Model):
     key = models.CharField(_('key'), help_text=_('A unique name for this attachment'), primary_key=True, max_length=255)


@@ -40,4 +43,3 @@ class Attachment(models.Model):
 
     def __unicode__(self):
         return self.key
 
     def __unicode__(self):
         return self.key

-