Changeset 755

Timestamp:

02/25/11 01:19:18 (2 years ago)

Author:

brent

Message:

Added changes to support eduCommons 2.x

Location:

Products.ecmigration/trunk/Products/ecmigration

Files:

• MigrationTool.py (modified) (1 diff)
• __init__.py (modified) (1 diff)
• migrate.py (modified) (9 diffs)

Products.ecmigration/trunk/Products/ecmigration/MigrationTool.py

@@ -67 +67 @@
     security.declareProtected(ManagePortal, 'importContent')
     def importContent(self, REQUEST=None):
-        mig = ECMigration(self)
+        """ Import migrated content into eduCommons """
+        mig = ECMigration(self.portal_url.getPortalObject())
         mig.importContent()
 
-    def exportContent(self, REQUEST=None):
-        mig = ECMigration(self)
+    security.declareProtected(ManagePortal, 'exportContent')
+    def exportContent(self, REQUEST=None, filename=None):
+        """ Export content from eduCommons """
+        mig = ECMigration(self.portal_url.getPortalObject())
         mig.exportContent()
 

Products.ecmigration/trunk/Products/ecmigration/__init__.py

@@ -35 +35 @@
 import MigrationTool
 
-#from Products.GenericSetup import profile_registry
-#from Products.GenericSetup import EXTENSION
-#from Products.CMFPlone.interfaces import IPloneSiteRoot
-#
-#profile_registry.registerProfile('default',
-#                                 'ecmigration',
-#                                 'Migration tool for eduCommons',
-#                                 'profiles/default',
-#                                 'ecmigration',
-#                                 EXTENSION,
-#                                 for_=IPloneSiteRoot)
-  
 tools = (MigrationTool.ECMigrationTool,)
 

Products.ecmigration/trunk/Products/ecmigration/migrate.py

@@ -121 +121 @@
         }
 
+    id_transforms = {
+        'About':'about',
+        'Help':'help',
+        }
+
+        
+
     def __init__(self, context):
         self.context = context
@@ -160 +167 @@
         oid = '/'.join(data['filename'].split(os.sep))
         print oid
-        context = self.portal_url.getPortalObject()
-        obj = self.getObjectByPath(context, oid)
-        if not obj:
-            # Object does not exist, create it
-            parent = self.getObjectByPath(context, '/'.join(oid.split('/')[:-1]))
-            if parent:
-                nid = oid.split('/')[-1]
-                _createObjectByType(data['type'], parent, id=nid)
-                obj = getattr(parent, nid)
-        if obj:
-            self.updateObject(obj, data)
+        try:
+            obj = self.getObjectByPath(oid)
+        except TypeError:
+            pass
+        else:
+            if not obj:
+                # Object does not exist, create it
+                parent = self.getObjectByPath('/'.join(oid.split('/')[:-1]))
+                if parent:
+                    nid = oid.split('/')[-1]
+                    _createObjectByType(data['type'], parent, id=nid)
+                    obj = getattr(parent, nid)
+            if obj:
+                if getattr(obj, 'getId', None):
+                    self.updateObject(obj, data)
 
     def updateObject(self, obj, data):
         """ Update the object with the new settings """
         for x in data['fields']:
-            obj.getField(x).set(obj, data['fields'][x])
+            try:
+                field = obj.getField(x)
+            except AttributeError:
+                import pdb; pdb.set_trace()
+            if field:
+                field.set(obj, data['fields'][x])
         obj.workflow_history = data['workflowhistory']
         if data.has_key('rightsholder'):
@@ -194 +210 @@
                 order = ICourseOrder(obj)
                 order.setPositionInCourse(data['courseorder'])
-        obj.reindexObject()
-
-    def getObjectByPath(self, context, path):
+        try:
+            obj.reindexObject()
+        except AttributeError:
+            import pdb; pdb.set_trace()
+
+    def getObjectByPath(self, path):
         """ Return an object via its path """
         try:
-            obj = context.restrictedTraverse(path)
+            obj = self.context.restrictedTraverse(path)
         except KeyError:
             obj = None
@@ -215 +234 @@
         brains = self.context.portal_catalog(path={'query':'/', 'depth':2,},)
         tf = TarArchiveManager(fn, 'w:bz2')
-        #self.exportUsers(context, tf)
+        self.exportUsers(context, tf)
         self.exportObjects(brains, tf)
-        #for x in brains:
-        #    print x.getPath()
-        #    self.exportObject(x, tf)
         tf.close()
-
-    def exportObjects(self, brains, tf):
-        for x in brains:
-            self.exportObject(x, tf)
-            if x.is_folderish:
-                brains = self.context.portal_catalog(path={'query':x.getPath(), 'depth':1,},)
-                self.exportObjects(brains, tf)
 
     def exportUsers(self, portal, archive):
@@ -243 +252 @@
             archive.addFile(fn, objstore, float(DateTime()))
 
+    def exportObjects(self, brains, tf):
+        for x in brains:
+            self.exportObject(x, tf)
+            if x.is_folderish:
+                brains = self.context.portal_catalog(path={'query':x.getPath(), 'depth':1,},)
+                self.exportObjects(brains, tf)
+
     def exportObject(self, brain, archive):
         """ Export an object """
         fn = self._getPath(brain)
         print fn
+        objstore = { 'filename':fn }
         obj = brain.getObject()
-        objstore = { 'filename':fn }
         self._storeData(obj, objstore)
         lmod = obj.getRawModification_date()
@@ -261 +277 @@
         opath = brain.getPath()
         fn = opath.split('/')
+        self._transformId(fn)
         return os.sep.join(fn[1:])
 
     def _storeData(self, obj, objstore):
         """ Export Object Metadata """
-        objstore['type'] = self.transformType(obj.portal_type)
+        objstore['type'] = self._transformType(obj.portal_type)
+        # Get field data
         objstore['fields'] = {}
         for x in obj.Schema().fields():
@@ -271 +289 @@
             if 'id' != fid:
                 if fid in ['file', 'image']: # and 'ATBlob' == obj.meta_type:
+                    # Object is a file, must get data from the file
+                    # In order to pickle it
                     objstore['fields'][fid] = x.get(obj).data
                 else:
-                    objstore['fields'][fid] = x.get(obj)
+                    if 'clearedCopyright' == fid:
+                        # if clearedcopyright flag is stored as a field
+                        # move it to annotations instead
+                        objstore['clearedcopyright'] = x.get(obj)
+                    else:
+                        # Use the usual method to get the field data
+                        objstore['fields'][fid] = x.get(obj)
+        # Get non field related data
         objstore['owner'] = obj.getOwner().getId()
         objstore['workflowhistory'] = obj.workflow_history
+        # Get annotation related data
         if ILicensable.providedBy(obj):
             lic = ILicense(obj)
@@ -293 +321 @@
                 objstore['courseorder'] = order.getPositionInCourse()
 
-    def transformType(self, ptype):
+    def _transformType(self, ptype):
         """ Change type """
         if self.transforms.has_key(ptype):
@@ -299 +327 @@
         else:
             return ptype
+
+    def _transformId(self, fn):
+        """ Change IDs """
+        if len(fn) > 1 and self.id_transforms.has_key(fn[1]):
+            import pdb; pdb.set_trace()
+            fn[1] = self.id_transforms[fn[1]]