Changeset 1024

Timestamp:

12/07/07 15:24:36

Author:

mylan

Message:

Fix importing objects issues: Reindex objects, fix Portal Tabs issue, CMFEdition issue.

Files:

• qPloneSkinDump/branches/plone_3.0/skin_template/fixes.py (added)
• qPloneSkinDump/branches/plone_3.0/skin_template/utils.py (modified) (4 diffs)

qPloneSkinDump/branches/plone_3.0/skin_template/utils.py

@@ -1 +1 @@
-import transaction
-import os, sys, re, string
+from sets import Set
-from StringIO import StringIO
-from time import gmtime, strftime
@@ -9 +10 @@
-from Products.CMFCore.DirectoryView import addDirectoryViews
-from Products.%(SKIN_PRODUCT_NAME)s.config import *
+from fixes import fix
-
-######################################################################
@@ -193 +195 @@
-    print >> import_out, SUMMARY_CLEAN
-
+def fixImportingIssues(portal, beforeimporting_objects):
+    ''' Fix defects of importing process: reindexing, other'''
+    afterimporting_objects = portal.objectItems()
+    diff_objects = list(Set(afterimporting_objects)-Set(beforeimporting_objects))
+    for id, ob in diff_objects:
+        if id.startswith('back_'):
+            continue
+        fix(ob)
+
-################    MAIN    ################
-def performImportToPortal(portal):
@@ -199 +210 @@
-    instance_ipath, product_ipath, temp_dir_path, product_file_names = copyToInstanceImport()
-    if product_file_names:
+        beforeimporting_objects = portal.objectItems()
-        importToPortalRoot(portal, product_file_names, temp_dir_path)
+        fixImportingIssues(portal, beforeimporting_objects)
-        cleanInstanceImport(instance_ipath, product_file_names, temp_dir_path)
-    else: