[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py Merge r94050 from trunk: shortcut for path-longer-than-anything-indexed case

Martijn Pieters mj at zopatista.com
Sun Dec 14 08:27:34 EST 2008


Log message for revision 94052:
  Merge r94050 from trunk: shortcut for path-longer-than-anything-indexed case

Changed:
  U   Zope/branches/2.10/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py

-=-
Modified: Zope/branches/2.10/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py
===================================================================
--- Zope/branches/2.10/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py	2008-12-14 13:27:14 UTC (rev 94051)
+++ Zope/branches/2.10/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py	2008-12-14 13:27:33 UTC (rev 94052)
@@ -179,6 +179,10 @@
                  for level in xrange(self._depth + 1)])
 
         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())



More information about the Zope-Checkins mailing list