Changeset 894

Timestamp:

06/13/12 17:19:59 (11 months ago)

Author:

brent

Message:

Changes to make import more robust.

File:

• Products.ecmigration/trunk/Products/ecmigration/migrate.py (modified) (4 diffs)

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

@@ -455 +455 @@
                 else:
                     dt = data['type']
-                _createObjectByType(dt, parent, id=nid)
-                obj = getattr(parent, nid)
+                    parent.invokeFactory(type_name=dt, id=nid)
+                    obj = parent[nid]
             else:
                 pass
@@ -499 +499 @@
                     self.crosslistings.append((obj, data['fields'][x]))
                 else:
-                    field.set(obj, data['fields'][x])
+                    if 'title' == x:
+                        field.set(obj, data['fields'][x].decode('utf-8'))
+                    elif x != 'language':
+                        field.set(obj, data['fields'][x])
         if data.has_key('rightsholder'):
             if ILicensable.providedBy(obj):
@@ -548 +551 @@
         """ Unpickle metadata and return it. """
         data = archive.getFile(fn)
-        return Pickle.loads(data)
+        return Pickle.loads(data.encode('utf-8'))
 
     def _getObjectByPath(self, path):
@@ -555 +558 @@
         obj = self.context
         for x in opath:
-            if getattr(obj.aq_base, x, None):
+            if x in obj.objectIds():
                 obj = obj[x]
             else: