[zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.6 setupZopeOrg.py:1.62

[Sidnei da Silva]

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

Modified Files:
	NZOMigrate.py setupZopeOrg.py 
Log Message:
Improved ownership migration. Few mods to make setupZopeOrg cooperate with latest Plone.

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.5 => 1.6 ===
 def normalizeMetaType(meta_type):
     return meta_type.replace(' ', '')
 
-def fixZWikiPortalType(self):
-    ct = self.portal_catalog
-    result = ct(meta_type='ZWiki Page')
-    counter = 0
-    for r in result:
-        obj = ct.getobject(r.data_record_id_)
-        obj.portal_type = 'ZWiki Page'
-        ct.reindexObject(obj, idxs=['portal_type'])
-        counter += 1
-        if not (counter % 100):
-            get_transaction().commit(1)
-    return 'ok'
+
+# this method came from PTK -> CMF migration script
 
 def _cleanupOwnership(ob, res, cleanup_children):
     '''
@@ -513,6 +503,9 @@
             oids = [o for o in source.objectIds() \
                        if (path + (o, )) not in ignore]
             oids.sort()
+            if 'acl_users' in oids:
+                oids.remove('acl_users')
+                oids.insert(0, 'acl_users')
             for oid in oids:
                 obj = getattr(source, oid)
                 try:
@@ -534,8 +527,12 @@
                               ' %s: Failed.\n' % obj.absolute_url(relative=1))
                 else:
                     new_obj = self.fixOwnership(obj, new_obj)
-                    new_obj = self.fixModificationDate(obj, new_obj)
                     new_obj = self.copyProperties(obj, new_obj)
+                    res = []
+                    new_obj = _cleanupOwnership(obj, res, 0)
+                    self.log('\n'.join(res))
+                    new_obj = self.fixModificationDate(obj, new_obj)
+
                     ct = getToolByName(new_obj, 'portal_catalog', None)
                     if ct is not None:
                         try: ct.reindexObject(obj)


=== Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.61 => 1.62 ===
                   , 'Formulator'
                   , 'ExternalEditor'
                   )
-SKINPATHS = ( 'Basic', )
 
-SKINS = ( 'software_product'
-        , 'zpt_membership'
-        , 'zopeorg'
-        , 'nzo'
+SKINPATHS = ( 'Basic',
+              'Plone Default',
+              'Plone Autumn',
+              'Plone Core',
+              'Plone Corporate',
+              'Plone Core Inverted',
+              'Plone Kitty',
+              'Plone Greensleeves',
+              'Plone Mozilla',
+              'Plone Mozilla New',
+              'Plone Prime',
+              'Plone Zed'
+              )
+
+SKINS = ( 'nzo',
         )
 
 ADD_INDEXES = ()
@@ -267,6 +277,8 @@
 
     # Run the CMFCalendar install script
     log.append('\n * Executing CMFCalendar install script')
+    if 'portal_calendar' in portal.objectIds():
+        portal.manage_delObjects(ids = ['portal_catalog'])
     log_str = portal.installCMFCalendar()
     log_list = string.split(log_str, '\n')
     for i in range(len(log_list)):
@@ -345,9 +357,20 @@
             ', '.join(delete_skins))
 
     skins = skins_tool.getSkinSelections()
+    if not 'NZO' in skins:
+        skins_tool.addSkinSelection('NZO', 'custom, zpt_topic, \
+        zpt_calendar, zpt_content, zpt_generic, zpt_control, topic, \
+        calendar, content, generic, control, Images')
+        skins_tool.default_skin = 'NZO'
+        skins = skins_tool.getSkinSelections()
+        log.append('   - Set default skin to newly added NZO.')
+                
     if skins_tool.getDefaultSkin() not in skins:
-        skins_tool.default_skin = SKINPATHS[0]
-        log.append('   - Set default skin to: %s' % SKINPATHS[0])
+        for skin in SKINPATHS:
+            if skin in skins:
+                skins_tool.default_skin = skin
+                log.append('   - Set default skin to: %s' % skin)
+                break
 
 def registerSkins( portal_obj ):
     """ Register skins as Filesystem Directory Views"""
@@ -355,6 +378,7 @@
     installed_skins = skins_tool.objectIds()
     prod_path = zopeorg_globals['__path__'][0]
     skin_path = os.path.join( prod_path,  'skins' )
+    default_skin = skins_tool.getDefaultSkin()
 
     for skin_name in SKINS:
         msg = '   - Filesystem Directory View "%s" added' % skin_name
@@ -367,6 +391,8 @@
     skins = skins_tool.getSkinPaths()
 
     for skin_name, skin_path in skins:
+        if skin_name != default_skin:
+            continue
         path_elems = map(string.strip, string.split(skin_path, ','))
         for zo_skin in SKINS:
             if zo_skin not in path_elems: