[zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.30

[Sidnei da Silva]

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv10636/Extensions

Modified Files:
	NZOMigrate.py 
Log Message:
Fixes to allow cataloging

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.29 => 1.30 ===
 from ZODB.POSException import POSKeyError
 from Acquisition import aq_base, aq_parent, aq_inner
 from Products.CMFCore.WorkflowCore import WorkflowException
+from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCollector.CollectorIssue import CollectorIssue
 from DateTime import DateTime
@@ -21,11 +22,17 @@
                    'Tracker', 'Utilities', 'WikiCentral', 'projects', 'CatalogHelp', 'Help', \
                    'SiteAnnouncement', 'WhatIsZope', 'ZopeArchitecture', 'ZopeNews', 'privacy.html',
                    'Members']
+        migrate.sort()
+        migrate = migrate[migrate.index('Members'):]
         ignore_path = ['/%s' % o for o in source.objectIds() if o not in migrate]
     members_ignore = ['billqian', 'edward', 'epson', 'ltunes', 'michel', 'superuser', \
                       'myUnreviewed', 'mail_password_form', \
                       'mail_password_template', 'password_html', 'tim.kidder', 'update_html', \
                       'index_html']
+    mids = source.Members.objectIds()
+    mids.sort()
+    mids = mids[:mids.index('ewilliams')]
+    members_ignore.extend(mids)
     dont_migrate = ['/Members/%s' % o for o in members_ignore]
     ignore_path.extend(dont_migrate)
     if exceptions is None:
@@ -168,13 +175,8 @@
                                               username=username,
                                               assignees=assignees)
         except WorkflowException:
-            action = 'new_issue'
-            issue.portal_workflow.doActionFor(issue,
-                                              action,
-                                              comment=comment,
-                                              username=username,
-                                              assignees=assignees)
-
+            pass # Leave as is. Probably pending.
+        
     new_status = issue.status().split('_')[0]
 
     transcript = issue.get_transcript()
@@ -774,11 +776,12 @@
         return None
 
     def ZWikiPage2ZWikiPage(self, obj, source, dest):
-        obj = self.defaultMigrationMethod(obj, source, dest)
         # ZWikiPages originally did not inherit from DublinCore, now they do,
         # so we take our time to initialize DublinCore while copying over.
         DefaultDublinCoreImpl.__init__(obj)
-        return obj
+        get_transaction().commit()
+        new_obj = self.defaultMigrationMethod(obj, source, dest)
+        return new_obj
 
     def ZCatalog2ZCatalog(self, obj, source, dest):
         self.log('Ignoring ZCatalog for now.\n')