Changeset 1599 in products

Timestamp:

Jan 27, 2010 5:27:53 PM (14 years ago)

Author:

mylan

Message:

Update sitewalker section for get all content of the container (without CMFCore.PortalFolder?'s filtering) + update object's type detection.

File:

• quintagroup.transmogrifier/branches/ofs/quintagroup/transmogrifier/sitewalker.py (modified) (2 diffs)

quintagroup.transmogrifier/branches/ofs/quintagroup/transmogrifier/sitewalker.py

@@ -28 +28 @@
 
     def getContained(self, obj):
-        contained = [(k, v) for k, v in obj.contentItems()
+        contained = [(k, v) for k, v in obj.objectItems()
                         if self.condition(None, context=v)]
         return tuple(contained)
 
+    def getType(obj):
+        if hasattr(obj, 'getPortalTypeName'):
+            return obj.getPortalTypeName()
+        return 'meta_type:%s' % obj.meta_type
+
     def walk(self, obj):
+        if obj.absolute_url().endswith('clark-county'):
+            import pdb;pdb.set_trace()
         if IFolderish.providedBy(obj) or IBaseFolder.providedBy(obj):
             contained = self.getContained(obj)
-            yield obj, tuple([(k, v.getPortalTypeName()) for k, v in contained])
+            yield obj, tuple([(k, self.getType(v) for k, v in contained])
             for k, v in contained:
                 for x in self.walk(v):
@@ -49 +56 @@
             item = {
                 self.pathkey: '/'.join(obj.getPhysicalPath()[2:]),
-                self.typekey: obj.getPortalTypeName(),
+                self.typekey: self.getType(obj),
             }
             if contained: