Changeset 143

Timestamp:

05/06/09 11:52:05 (4 years ago)

Author:

jon

Message:

Refactoring IMS

Location:

collective.imstransport/trunk/collective/imstransport

Files:

• browser/importform.py (modified) (2 diffs)
• config.py (added)
• utilities/ccreader.py (added)
• utilities/ccwriter.py (modified) (2 diffs)
• utilities/configure.zcml (modified) (1 diff)
• utilities/imsutility.py (modified) (1 diff)
• utilities/interfaces.py (modified) (1 diff)
• utilities/objcreator.py (modified) (4 diffs)

collective.imstransport/trunk/collective/imstransport/browser/importform.py

@@ -5 +5 @@
 from zope.app.form.browser.textwidgets import FileWidget            
 from zope.formlib.form import FormFields, action
-from zope.component import getUtility
+from zope.component import getUtility, getUtilitiesFor
 from collective.imstransport.utilities.imsutility import IIMSTransportUtility
+from collective.imstransport.utilities.interfaces import IIMSManifestReader
 
 from collective.imstransport import IMSTransportMessageFactory as _
@@ -18 +19 @@
 
 def imspackagetypevocabulary(self):
-    imstrans = getUtility(IIMSTransportUtility)
-    readers = imstrans.getReaders()
+
+    readers = []
+    imsreaders = getUtilitiesFor(IIMSManifestReader)
+    for reader in imsreaders:
+        readers.append((reader[0], reader[0]))
     return SimpleVocabulary.fromItems(readers)
 

collective.imstransport/trunk/collective/imstransport/utilities/ccwriter.py

@@ -93 +93 @@
                 if customMetadataString:
                     self.parseCustomString(customMetadataString, rlomwriter);
-
 
                 rlomwriter.writeFileNode(path)
@@ -169 +168 @@
 
         path = obj.virtual_url_path().replace(self.context.aq_inner.aq_parent.virtual_url_path(), '')[1:]
+
         if path[-1] == '/':
             path = path[:-1]
+
+        path_parts = path.split('/')
+        if len(path_parts) == 1:
+            return ''
+        else:
+            path = '/'.join(path_parts[1:])
 
         if hasattr(obj.aq_explicit, 'Format'):

collective.imstransport/trunk/collective/imstransport/utilities/configure.zcml

@@ -15 +15 @@
   <utility
      provides=".interfaces.IIMSManifestReader"
-     factory=".imscc.IMSCCReader"
+     factory=".ccreader.IMSCCReader"
      name="IMS Common Cartridge"
      />

collective.imstransport/trunk/collective/imstransport/utilities/imsutility.py

@@ -12 +12 @@
 
     implements(IIMSTransportUtility)
-#    tocpage = PageTemplateFile('tableofcontents',WWW_DIR)
 
     def importPackage(self, context, package, packagetype):
         reader = getUtility(IIMSManifestReader, packagetype)
-        manifestDictionary = reader.readManifest(package)
-        oc = getUtility(IIMSObjectCreator)
-        oc.createObject(context, manifestDictionary, package)
+        return reader.readPackage(context, package)
         
     def exportPackage(self, package, filename, packagetype = "Common Cartridge", wtype='Common Cartridge'):  
         writer = getUtility(IIMSManifestWriter, packagetype)
-#        writer.setDestination(ZipfileWriter(filename, package.getId()))
         return writer.createPackage(package, filename)
         

collective.imstransport/trunk/collective/imstransport/utilities/interfaces.py

@@ -28 +28 @@
         """ Return the desciptive name of the package type. """
 
-    def readManifest(file):
+    def readPackage(file):
         """ Read IMS CC manifest """
 

collective.imstransport/trunk/collective/imstransport/utilities/objcreator.py

@@ -4 +4 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from OFS.SimpleItem import SimpleItem
+from AccessControl import Unauthorized
 
 class ObjectCreator(object):
@@ -10 +11 @@
     implements(IIMSObjectCreator)
 
-    def createObject(self, context, objDict, zipfile):
+    def createObjects(self, objDict, context, source):
+        """ Read the manifest """
+
+        self.context = context
 
         for id in objDict:
+
             data = objDict[id]
+            # Recursively create objects based on metadata dictionary
+            parent = self.CreateFolderPath(context, data['path'])
 
-            # Recursively create objects based on metadata dictionary
-            parent = self.CreateFolderPath(context, data['path'].split('/'))
-            
             if not getattr(parent, data['id'], None):
                 parent.invokeFactory(data['type'], data['id'])
             obj = getattr(parent, data['id'])
-            obj.setTitle(data['title'])
-            
+
             if data.has_key('file'):
-                if (data['path']):
-                    path_to_file = '%s/%s' %(data['path'], data['file'])
-                else:
-                    path_to_file = data['file']
-                zf = ZipFile(zipfile, 'r')
+                path_to_file = data['file']
+                zf = source
                 if data['type'] == 'Image' or getattr(obj, 'setImage', None):
-                    obj.setImage(zf.read(path_to_file))
+                    obj.setImage(zf.readFile(path_to_file))
                 elif data['type'] == 'File' and getattr(obj, 'setFile', None):
-                    obj.setFile(zf.read(path_to_file))
+                    obj.setFile(zf.readFile(path_to_file))
                 elif data['type'] == 'Document' and getattr(obj, 'setText', None):
-                    obj.setText(zf.read(path_to_file))
-                zf.close() 
+                    obj.setText(zf.readFile(path_to_file))
             elif data.has_key('text'):
                 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])
 
             obj.reindexObject()
@@ -46 +57 @@
         
         temp = context
-        for path_elem in path:
+        pathsplit = path.split('/')
+
+        for path_elem in pathsplit:
             if not path_elem:
                 continue
@@ -58 +71 @@
 
         return temp
-    
-
-
-
-
-        
-        
-