thanks page and email for sciezki-kopernika

[edumed.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index ee07651..75feba1 100644 (file)
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -4,6 +4,7 @@ from django.core.urlresolvers import reverse
 from django.db import models
 from jsonfield import JSONField
 from fnpdjango.storage import BofhFileSystemStorage
 from django.db import models
 from jsonfield import JSONField
 from fnpdjango.storage import BofhFileSystemStorage

+

 from curriculum.models import Level, Curriculum, CurriculumCourse
 import logging
 
 from curriculum.models import Level, Curriculum, CurriculumCourse
 import logging
 


@@ -123,8 +124,7 @@ class Lesson(models.Model):
     def publish(cls, infile, ignore_incomplete=False):
         from librarian.parser import WLDocument
         from django.core.files.base import ContentFile
     def publish(cls, infile, ignore_incomplete=False):
         from librarian.parser import WLDocument
         from django.core.files.base import ContentFile

-        xml = infile.get_string()
-        wldoc = WLDocument.from_string(xml)
+        wldoc = WLDocument(infile)

 
         # Check if not section metadata block.
         if wldoc.book_info.parts:
 
         # Check if not section metadata block.
         if wldoc.book_info.parts:


@@ -138,7 +138,7 @@ class Lesson(models.Model):
             lesson = cls(slug=slug, order=0)
 
         # Save XML file
             lesson = cls(slug=slug, order=0)
 
         # Save XML file

-        lesson.xml_file.save('%s.xml' % slug, ContentFile(xml), save=False)
+        lesson.xml_file.save('%s.xml' % slug, ContentFile(infile.get_string()), save=False)

         lesson.title = wldoc.book_info.title
 
         lesson.level = Level.objects.get(meta_name=wldoc.book_info.audience)
         lesson.title = wldoc.book_info.title
 
         lesson.level = Level.objects.get(meta_name=wldoc.book_info.audience)


@@ -152,6 +152,21 @@ class Lesson(models.Model):
             lesson.build_package(student=True)
         return lesson
 
             lesson.build_package(student=True)
         return lesson
 

+    def republish(self, repackage_level=True, attachments=None):
+        from librarian import IOFile
+        import os.path
+        from django.conf import settings
+        if attachments is None:
+            attachments = {}
+            for attachment in self.attachment_set.all():
+                full_name = os.path.join(settings.MEDIA_ROOT, attachment.file.name)
+                f = IOFile.from_filename(full_name)
+                attachments['%s.%s' % (attachment.slug, attachment.ext)] = f
+        infile = IOFile.from_filename(self.xml_file.path, attachments=attachments)
+        Lesson.publish(infile)
+        if repackage_level:
+            self.level.build_packages()
+

     def populate_dc(self):
         from librarian.parser import WLDocument
         wldoc = WLDocument.from_file(self.xml_file.path)
     def populate_dc(self):
         from librarian.parser import WLDocument
         wldoc = WLDocument.from_file(self.xml_file.path)


@@ -274,7 +289,7 @@ class Lesson(models.Model):
             return None
 
     def requires_internet(self):
             return None
 
     def requires_internet(self):

-        return 'internet' in self.dc.get('requires', [])
+        return any(requirement in self.dc.get('requires', []) for requirement in ('internet', 'Internet'))

 
 
 class Attachment(models.Model):
 
 
 class Attachment(models.Model):