accept internet/Internet in dc:requires

[edumed.git] / catalogue / models.py

diff --git a/catalogue/models.py b/catalogue/models.py
index 2f9a76d..75feba1 100644 (file)
--- a/catalogue/models.py
+++ b/catalogue/models.py
@@ -152,9 +152,17 @@ class Lesson(models.Model):
             lesson.build_package(student=True)
         return lesson
 
-    def republish(self, repackage_level=True):
+    def republish(self, repackage_level=True, attachments=None):
         from librarian import IOFile
-        infile = IOFile.from_filename(self.xml_file.path)
+        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()
@@ -281,7 +289,7 @@ class Lesson(models.Model):
             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):