Changeset 171

Timestamp:

05/09/09 10:46:04 (4 years ago)

Author:

jon

Message:

Providing type information based on ec metadata

Location:

enpraxis.educommons/branches/educommons-imsintegration/enpraxis/educommons/utilities

Files:

• eduimsccreader.py (modified) (1 diff)
• objcreator.py (modified) (3 diffs)

enpraxis.educommons/branches/educommons-imsintegration/enpraxis/educommons/utilities/eduimsccreader.py

@@ -26 +26 @@
                 if ot not in ['Course', 'FSSFile', 'Document', 'File', 'Image', 'Link']:
                     raise ManifestError, '"%s" is not a recognized object type.' %ot
-                metadata['Type'] = '%s' %ot
+                metadata['type'] = '%s' %ot
 
         copyright_nodes = node.getElementsByTagNameNS(ec_namespace, 'copyright')

enpraxis.educommons/branches/educommons-imsintegration/enpraxis/educommons/utilities/objcreator.py

@@ -16 +16 @@
         for id in objDict:
             data = objDict[id]
-            if data.has_key('Type') and data['Type'] == 'Course':
+            if data.has_key('type') and data['type'] == 'Course':
                 obj = context
                 obj.setText(zf.readFile(data['file']))
-                for key in data.keys():
-                    if key not in ['id', 'file']:
-                        field = obj.getField(key)
-                        if field:
-                            mutator = field.getMutator(obj)
-                            if mutator:
-                                if field.__name__ == 'excludeFromNav':
-                                    mutator('False')
-                                else:
-                                    mutator(data[key])
+                self.applyMetadata(obj, data)
+                if data['id'].split('.')[-1] == 'html' and data['id'].find('.html') > 0:
+                    courseid = '.'.join(data['id'].split('.')[:-1]).encode('utf-8')
+                    objpar = obj.aq_inner.aq_parent
+                    if getattr(objpar, courseid, None):
+                        raise ManifestError, 'Could not import package because a course with id "' + courseid + '" already exists.'
+                    else:
+                        obj.setId(courseid)
                 obj.reindexObject()
                 context.reindexObject()
@@ -39 +37 @@
 
             data = objDict[id]
-            if data.has_key('Type') and data['Type'] == 'Course':
+            if data.has_key('type') and data['type'] == 'Course':
                 continue
             else:
@@ -64 +62 @@
                     obj.setText(data['text'])
 
-                # Set the metadata on the object
-                for key in data.keys():
-                    if key != 'file':
-                        field = obj.getField(key)
-                        if field:
-                            mutator = field.getMutator(obj)
-                            if mutator:
-                                if field.__name__ == 'excludeFromNav':
-                                    mutator('False')
-                                else:
-                                    mutator(data[key])
-
+                self.applyMetadata(obj, data)
 
             obj.reindexObject()
             self.context.reindexObject()
+
+
+    def applyMetadata(self, obj, data):
+        # Set the metadata on the object
+        for key in data.keys():
+            if key not in  ['file', 'id', 'type']:
+                field = obj.getField(key)
+                if field:
+                    mutator = field.getMutator(obj)
+                    if mutator:
+                        if field.__name__ == 'excludeFromNav':
+                            mutator('False')
+                        else:
+                            mutator(data[key])
+
 
     def CreateFolderPath(self, context, path):