[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/ - replace 'getIcon' by 'getIconURL' column

[Yvo Schubbe]

Log message for revision 105957:
  - replace 'getIcon' by 'getIconURL' column

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
  UU  Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml	2009-11-22 02:40:35 UTC (rev 105956)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml	2009-11-23 07:34:46 UTC (rev 105957)
@@ -95,6 +95,12 @@
         checker=".to22.check_action_properties"
         />
 
+    <genericsetup:upgradeStep
+        title="Upgrade catalog columns"
+        handler=".to22.upgrade_catalog_columns"
+        checker=".to22.check_catalog_columns"
+        />
+
   </genericsetup:upgradeSteps>
 
   <genericsetup:upgradeStep

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py	2009-11-22 02:40:35 UTC (rev 105956)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py	2009-11-23 07:34:46 UTC (rev 105957)
@@ -206,3 +206,27 @@
                 icon = 'string:${portal_url}/%s' % icon
                 action._setPropValue('icon_expr', icon)
                 logger.info("Action '%s' changed." % action.getId())
+
+def check_catalog_columns(tool):
+    """2.1.x to 2.2.0 upgrade step checker
+    """
+    ctool = getToolByName(tool, 'portal_catalog')
+    columns = ctool.schema()
+    if 'getIcon' in columns:
+        return True
+    if 'getIconURL' not in columns:
+        return True
+    return False
+
+def upgrade_catalog_columns(tool):
+    """2.1.x to 2.2.0 upgrade step handler
+    """
+    logger = logging.getLogger('GenericSetup.upgrade')
+    ctool = getToolByName(tool, 'portal_catalog')
+    columns = ctool.schema()
+    if 'getIcon' in columns:
+        ctool.delColumn('getIcon')
+        logger.info("Catalog column 'getIcon' deleted.")
+    if 'getIconURL' not in columns:
+        ctool.addColumn('getIconURL')
+        logger.info("Catalog column 'getIconURL' added.")


Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py
___________________________________________________________________
Deleted: svn:mime-type
   - text/plain