Merge r94050 from trunk: shortcut for path-longer-than-anything-indexed case

e0fe9f85 · Martijn Pieters · e7ec5e8d · e0fe9f85
Commit e0fe9f85 authored Dec 14, 2008 by Martijn Pieters
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

lib/python/Products/PluginIndexes/PathIndex/PathIndex.py lib/python/Products/PluginIndexes/PathIndex/PathIndex.py +4 -0

No files found.
--- a/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
+++ b/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
@@ -180,6 +180,10 @@ class PathIndex(Persistent, SimpleItem):

        comps = filter(None, path.split('/'))
        
+        if level + len(comps) - 1 > self._depth:
+            # Our search is for a path longer than anything in the index
+            return IISet()
+
        if len(comps) == 0:
            return IISet(self._unindex.keys())