Changeset 198 for enpraxis.educommons/branches/educommons-imsintegration/enpraxis/educommons/utilities/eduimsccreader.py

Timestamp:

05/14/09 19:09:36 (4 years ago)

Author:

jon

Message:

Adding mit import

File:

• enpraxis.educommons/branches/educommons-imsintegration/enpraxis/educommons/utilities/eduimsccreader.py (modified) (4 diffs)

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

@@ -119 +119 @@
     implements(IIMSManifestReader)
 
-    def readPackage(self, context, input):
+    def readPackage(self, file, context):
         """ Read the manifest """
 
-        source = ZipfileReader(input)
+
+        source = ZipfileReader(file)
         objDict = {}
 
@@ -128 +129 @@
              return False, 'Internal error. No source object specified'
 
-        ccreader = CCReader(context, source)
+        ccreader = CCReader()
              
         manifest = source.readManifest()
@@ -141 +142 @@
 
         for resourceid in resourceids:
-            ccresourcereader = eduCCResourceReader(ccreader, resourceid, {})            
-            resdata = self.parseResourceMetadata(ccresourcereader, resourceid, context)
+
+            ccresourcereader = eduCCResourceReader(ccreader, resourceid)            
+            resdata = self._parseResourceMetadata(ccresourcereader, resourceid)
             reshref = ccresourcereader.getHref()
+            cctype = ccresourcereader.getCCType()
             files = ccresourcereader.readFiles()
-
-            hashref = ''
-            if files:
-                for file in files:
-                    hashref = '%s%s' %(resourceid, file)
-                    id = self.createIdFromFile(file)
-                    path = self.createPathFromFile(file)
-
-                    if reshref == file or len(files) == 1:
-                        hashref = resourceid
-                        objDict[hashref] = resdata
-                        
-                        if hashref in [org for org in orgdata if org]:
-                            objDict[hashref]['excludeFromNav'] = False
-
-                    self.parseFile(context, file, objDict, hashref, id, path)
-
+            hashref = resourceid
+
+            if files and cctype == 'imswl_xmlv1p0':
+                file = files[0]
+
+                id = self._createIdFromFile(file)
+                id = id.replace('.xml','')
+                path = self._createPathFromFile(file)
+
+                objDict[hashref] = resdata
+                objDict[hashref]['type'] = 'Link'
+                if not objDict[hashref].has_key('path'):
+                    objDict[hashref]['path'] = path
+                if not objDict[hashref].has_key('id'):
+                    objDict[hashref]['id'] = id
+
+                linkxml = source.readFile(file)
+                linktuple = ccresourcereader.getLink(self.WL, 'webLink', linkxml)
+
+                objDict[hashref]['title'] = linktuple[0]
+                objDict[hashref]['remoteUrl'] = linktuple[1]                
+                
+            elif cctype  == 'webcontent':
+                if files:
+                    for file in files:
+
+                        id = self._createIdFromFile(file)
+                        path = self._createPathFromFile(file)
+
+                        if reshref == file or len(files) == 1:
+                            hashref = resourceid
+                            objDict[hashref] = resdata
+
+                            # Check if item is in organizations section
+                            orgs = [org for org in orgdata if org]
+                            if hashref in orgs:
+                                objDict[hashref]['excludeFromNav'] = False
+                                objDict[hashref]['title'] = orgdata[hashref]
+                            else:
+                                objDict[hashref]['excludeFromNav'] = True
+
+                        else:
+                            hashref = '%s%s' %(resourceid, file)
+                            objDict[hashref] = {}
+                            objDict[hashref]['excludeFromNav'] = True  
+                                                           
+                        self._parseFile(file, objDict, hashref, id, path)
+
+        
         objcreator = getUtility(IIMSObjectCreator)
         objcreator.createObjects(objDict, context, source)
@@ -167 +202 @@
 
 
-    def parseResourceMetadata(self, resourcereader, resourceid, context):
+
+#         source = ZipfileReader(input)
+#         objDict = {}
+
+#         if not source:
+#              return False, 'Internal error. No source object specified'
+
+#         ccreader = CCReader(context, source)
+             
+#         manifest = source.readManifest()
+#         if not manifest:
+#             return False, \
+#                    'Manifest', \
+#                    'Could not locate manifest file "imsmanifest.xml" in the zip archive.'
+
+#         ccreader.parseManifest(manifest)
+#         orgdata = ccreader.readOrganizations()
+#         resourceids = ccreader.readResources()
+
+#         for resourceid in resourceids:
+#             ccresourcereader = eduCCResourceReader(ccreader, resourceid, {})            
+#             resdata = self.parseResourceMetadata(ccresourcereader, resourceid, context)
+#             reshref = ccresourcereader.getHref()
+#             files = ccresourcereader.readFiles()
+
+#             hashref = ''
+#             if files:
+#                 for file in files:
+#                     hashref = '%s%s' %(resourceid, file)
+#                     id = self.createIdFromFile(file)
+#                     path = self.createPathFromFile(file)
+
+#                     if reshref == file or len(files) == 1:
+#                         hashref = resourceid
+#                         objDict[hashref] = resdata
+                        
+#                         if hashref in [org for org in orgdata if org]:
+#                             objDict[hashref]['excludeFromNav'] = False
+
+#                     self.parseFile(context, file, objDict, hashref, id, path)
+
+#         objcreator = getUtility(IIMSObjectCreator)
+#         objcreator.createObjects(objDict, context, source)
+#         return
+
+
+    def _parseResourceMetadata(self, resourcereader, resourceid):
         """ Read the resource metadata """