Changeset 1446 in products for quintagroup.transmogrifier/trunk/quintagroup/transmogrifier/sitewalker.py

Timestamp:

Dec 8, 2009 7:53:25 AM (15 years ago)

Author:

piv

Message:

merge from plone 2.1 branch: r2465-2483

Location:

quintagroup.transmogrifier/trunk

Files:

• . (modified) (1 prop)
• quintagroup/transmogrifier/sitewalker.py (modified) (2 diffs)

quintagroup.transmogrifier/trunk/quintagroup/transmogrifier/sitewalker.py

@@ -3 +3 @@
 
 from collective.transmogrifier.interfaces import ISection, ISectionBlueprint
+from collective.transmogrifier.utils import Condition
 
 from Products.CMFCore.interfaces import IFolderish
@@ -23 +24 @@
         self.storage = self.anno.setdefault(VALIDATIONKEY, [])
 
+        self.condition = Condition(options.get('condition', 'python:True'),
+                                   transmogrifier, name, options)
+
+    def getContained(self, obj):
+        contained = [(k, v) for k, v in obj.contentItems()
+                        if self.condition(None, context=v)]
+        return tuple(contained)
+
     def walk(self, obj):
         if IFolderish.providedBy(obj) or IBaseFolder.providedBy(obj):
-            contained = [(k, v.getPortalTypeName()) for k, v in obj.contentItems()]
-            yield obj, tuple(contained)
-            for v in obj.contentValues():
+            contained = self.getContained(obj)
+            yield obj, tuple([(k, v.getPortalTypeName()) for k, v in contained])
+            for k, v in contained:
                 for x in self.walk(v):
                     yield x