Librarian in regular requirements.

[redakcja.git] / apps / catalogue / models / image.py

diff --git a/apps/catalogue/models/image.py b/apps/catalogue/models/image.py
index 7b5ce1f..646dd0a 100755 (executable)
--- a/apps/catalogue/models/image.py
+++ b/apps/catalogue/models/image.py
@@ -9,6 +9,7 @@ from django.db import models
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 from catalogue.helpers import cached_in_field
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
 from catalogue.helpers import cached_in_field

+from catalogue.models import Project

 from catalogue.tasks import refresh_instance
 from dvcs import models as dvcs_models
 
 from catalogue.tasks import refresh_instance
 from dvcs import models as dvcs_models
 


@@ -21,6 +22,7 @@ class Image(dvcs_models.Document):
     title = models.CharField(_('title'), max_length=255, blank=True)
     slug = models.SlugField(_('slug'), unique=True)
     public = models.BooleanField(_('public'), default=True, db_index=True)
     title = models.CharField(_('title'), max_length=255, blank=True)
     slug = models.SlugField(_('slug'), unique=True)
     public = models.BooleanField(_('public'), default=True, db_index=True)

+    project = models.ForeignKey(Project, null=True, blank=True)

 
     # cache
     _short_html = models.TextField(null=True, blank=True, editable=False)
 
     # cache
     _short_html = models.TextField(null=True, blank=True, editable=False)


@@ -46,10 +48,14 @@ class Image(dvcs_models.Document):
         return ("catalogue_image", [self.slug])
 
     def correct_about(self):
         return ("catalogue_image", [self.slug])
 
     def correct_about(self):

-        return "http://%s%s" % (
+        return ["http://%s%s" % (

             Site.objects.get_current().domain,
             self.get_absolute_url()
             Site.objects.get_current().domain,
             self.get_absolute_url()

-        )
+            ),
+            "http://%s%s" % (
+                'obrazy.redakcja.wolnelektury.pl',
+                self.get_absolute_url()
+            )]

 
     # State & cache
     # =============
 
     # State & cache
     # =============


@@ -74,7 +80,8 @@ class Image(dvcs_models.Document):
         picture_xml = publishable.materialize()
 
         try:
         picture_xml = publishable.materialize()
 
         try:

-            picture = WLPicture.from_string(picture_xml.encode('utf-8'),
+            picture = WLPicture.from_bytes(
+                    picture_xml.encode('utf-8'),

                     image_store=SelfImageStore)
         except ParseError, e:
             raise AssertionError(_('Invalid XML') + ': ' + str(e))
                     image_store=SelfImageStore)
         except ParseError, e:
             raise AssertionError(_('Invalid XML') + ': ' + str(e))


@@ -84,8 +91,8 @@ class Image(dvcs_models.Document):
             raise AssertionError(_('Invalid Dublin Core') + ': ' + str(e))
 
         valid_about = self.correct_about()
             raise AssertionError(_('Invalid Dublin Core') + ': ' + str(e))
 
         valid_about = self.correct_about()

-        assert picture.picture_info.about == valid_about, \
-                _("rdf:about is not") + " " + valid_about
+        assert picture.picture_info.about in valid_about, \
+                _("rdf:about is not") + " " + valid_about[0]

 
     def publishable_error(self):
         try:
 
     def publishable_error(self):
         try: