Changeset 3065 in products

Timestamp:

Jan 27, 2011 5:06:39 PM (14 years ago)

Author:

kroman0

Message:

vmaksymiv: Fixed catalogsource path-based exports

File:

• quintagroup.transmogrifier/branches/plone-2.1/quintagroup.transmogrifier/quintagroup/transmogrifier/catalogsource.py (modified) (11 diffs)

quintagroup.transmogrifier/branches/plone-2.1/quintagroup.transmogrifier/quintagroup/transmogrifier/catalogsource.py

@@ +1 @@
+import copy
+import logging
+
 from zope.interface import classProvides, implements
 from zope.app.annotation.interfaces import IAnnotations
@@ -7 +10 @@
 
 from quintagroup.transmogrifier.logger import VALIDATIONKEY
+
+logger = logging.getLogger("CatalogSourceSection")
 
 class CatalogSourceSection(object):
@@ -22 +27 @@
         self.pathkey = options.pop('path-key', '_path')
         self.entrieskey = options.pop('entries-key', '_entries')
+
+        # handle exclude-contained parameter
+        if "exclude-contained" in options.keys():
+            self.exclude_contained = options.pop('exclude-contained')
+            self.exclude_contained = self.exclude_contained == "true"
+        else:
+            self.exclude_contained = False
 
         # remove 'blueprint' option - it cannot be a query
@@ -43 +55 @@
 
         exported = []
+        exported_parents = []
 
         results = list(self.catalog(**self.query))
         results.sort(key=lambda x: x.getPath())
+
         for brain in results:
             # discussion items are indexed and they must be replaced to
@@ -68 +82 @@
             container_path = path.rsplit('/', 1)[0]
             while container_path:
+
                 if container_path in exported:
                     container_path = container_path.rsplit('/', 1)[0]
                     continue
-                contained = self.getContained(container_path)
+
+                exported_parents.append(container_path)
+
+                contained = self.getContained(container_path, results, exported_parents)
+
                 if contained:
                     exported.append(container_path)
@@ -79 +98 @@
                     })
                 container_path = container_path.rsplit('/', 1)[0]
+
             containers.reverse()
             # order metter for us
@@ -89 +109 @@
             }
             if brain.is_folderish:
-                contained = self.getContained(path)
+                contained = self.getContained(path, results, exported_parents)
                 if contained:
                     item[self.entrieskey] = contained
@@ -100 +120 @@
             del self.anno[VALIDATIONKEY]
 
-    def getContained(self, path):
+    def getContained(self, path, orignal_results, parents):
         """ Return list of (object_id, portal_type) for objects that are returned by catalog
             and contained in folder with given 'path'.
@@ -106 +126 @@
         results = []
         seen = []
-        raw_results = self.catalog(path=path, **self.query)
+
+
+        # Remove the orignal path element from the query if there was one
+        query = copy.deepcopy(self.query)
+        if "path" in query:
+            del query["path"]
+
+        raw_results = self.catalog(path=path, **query)
+
         for brain in raw_results:
             current = brain.getPath()
@@ -117 +145 @@
                 # object stored in subfolders, we need append to results their parent folder
                 parent_path = '/'.join([path, relative.split('/', 1)[0]])
-                if parent_path not in seen:                    
+                if parent_path not in seen:
                     res = self.catalog(path=path) #, meta_type='Folder')
                     for i in res:
@@ -128 +156 @@
                 seen.append(current)
                 results.append(brain)
-        contained = [(i.getId, str(i.portal_type)) for i in results]
+
+        def filter(r):
+
+            # Parent objects must be allowed always
+            for parent in parents:
+                if r.getPath() == parent:
+                    return True
+
+            if r["UID"] in allowed_uids:
+                return True
+            else:
+                logger.info("Excluded contained item as it did not match the orignal catalog query:" + str(r.getPath()))
+
+        if self.exclude_contained and orignal_results is not None:
+            # Filter contained results against our query, so that
+            # we do not export results from parent objects which did not match
+            # Build list of allowed object UIDs -
+            allowed_uids = [ r["UID"] for r in orignal_results ]
+
+            # All parents must be allowed always
+            filtered_results = [ r for r in results if filter(r) == True  ]
+        else:
+            # Don't filter child items
+            filtered_results = results
+
+        contained = [(i.getId, str(i.portal_type)) for i in filtered_results ]
+
         return tuple(contained)