Changeset 1760 in products for quintagroup.catalogupdater/trunk/quintagroup/catalogupdater

Timestamp:

Feb 17, 2010 1:38:20 PM (14 years ago)

Author:

mylan

Message:

Refactoring XMLAdapter - override existent ZCatalog XMLAdaptor with *update* attribute for *column* tag

Location:

quintagroup.catalogupdater/trunk/quintagroup/catalogupdater

Files:

• configure.zcml (modified) (1 diff)
• exportimport/catalogupdater.py (modified) (1 diff)
• exportimport/configure.zcml (deleted)
• exportimport/overrides.zcml (added)
• overrides.zcml (added)
• profiles (deleted)

quintagroup.catalogupdater/trunk/quintagroup/catalogupdater/configure.zcml

@@ -1 +1 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:five="http://namespaces.zope.org/five"
-    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     i18n_domain="quintagroup.catalogupdater">
-
-    <include package=".exportimport" />
 
     <utility factory=".utility.CatalogUpdaterUtility"
              name="catalog_updater" />
 
-    <!-- Mark ZCatalog class with own interface for correct
-         working of GenericSetup import handler -->
-
-    <class class="Products.ZCatalog.ZCatalog.ZCatalog">
-      <implements interface=".interfaces.IUpdatableCatalog" />
-    </class>
-
-    <!-- register GenericSetup profile -->
-    <genericsetup:registerProfile
-      name="default"
-      title="quintagroup.catalogupdater"
-      directory="profiles/default"
-      description="Register Catalog Updater import step handler [quintagroup.catalogupdater]"
-      provides="Products.GenericSetup.interfaces.EXTENSION"
-      />
-    
-
 </configure> 

quintagroup.catalogupdater/trunk/quintagroup/catalogupdater/exportimport/catalogupdater.py

@@ -4 +4 @@
 from zope.component import queryUtility
 
-from Products.CMFCore.utils import getToolByName
-from Products.GenericSetup.utils import importObjects
-from Products.GenericSetup.utils import XMLAdapterBase
+from Products.ZCatalog.interfaces import IZCatalog
 from Products.GenericSetup.interfaces import ISetupEnviron
+from Products.GenericSetup.ZCatalog.exportimport import ZCatalogXMLAdapter
 
-from quintagroup.catalogupdater.interfaces import IUpdatableCatalog
+from quintagroup.catalogupdater.interfaces import ICatalogUpdater
 
 
-class CatalogUpdaterXMLAdapter(XMLAdapterBase):
-    """XML Catalog columns updater for CatalogTool.
+class CatalogUpdaterXMLAdapter(ZCatalogXMLAdapter):
+    """XML im- and exporter for ZCatalog with
+       support of columns updates
     """
 
-    adapts(IUpdatableCatalog, ISetupEnviron)
+    adapts(IZCatalog, ISetupEnviron)
 
-    _LOGGER_ID = 'catalogupdater'
-
-    name = 'catalogupdater'
-
-    def _exportNode(self):
-        """Export the object as a DOM node.
-        """
-        return ''
-
-    def _importNode(self, node):
-        """Import the object from the DOM node.
-        """
-        self._updateColumns(node)
-        self._logger.info('Catalog columns updated.')
-
-
-    def _updateColumns(self, node):
-        columns = []
+    def _initColumns(self, node):
+        super(CatalogUpdaterXMLAdapter, self)._initColumns(node)
+        import pdb;pdb.set_trace()
+        updatecols = []
         for child in node.childNodes:
             if child.nodeName != 'column':
                 continue
-            col = str(child.getAttribute('value')).strip()
-            columns.append(col)
+            col = str(child.getAttribute('value'))
+            if child.hasAttribute('update'):
+                # Add the column to update list if it is there
+                if col in self.context.schema()[:]:
+                    updatecols.append(col)
+                continue
 
         # Update columns in catalog
-        if len(columns) > 0:
-
+        if len(updatecols) > 0:
             catalog = self.context
 
             self._logger.info('Updating %s columns for %s Catalog.' % (
-                columns, '/'.join(catalog.getPhysicalPaht())) )
+                updatecols, '/'.join(catalog.getPhysicalPaht())) )
 
             cu = queryUtility(ICatalogUpdater, name='catalog_updater')
-            cu.updateMetadata4All(catalog, columns)
-
-
-def updateCatalogColumns(context):
-    """Update catalog columns with catalog_updater tool.
-    """
-    site = context.getSite()
-    tool = getToolByName(site, 'portal_catalog')
-
-    importObjects(tool, '', context)
+            cu.updateMetadata4All(catalog, updatecols)