[Zope-Checkins] CVS: Zope/lib/python/Products/PluginIndexes/PathIndex - PathIndex.py:1.25.4.2

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/PluginIndexes/PathIndex
In directory cvs.zope.org:/tmp/cvs-serv20268/lib/python/Products/PluginIndexes/PathIndex

Modified Files:
      Tag: chrism-install-branch
	PathIndex.py 
Log Message:
Merging HEAD into chrism-install-branch.


=== Zope/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py 1.25.4.1 => 1.25.4.2 ===
--- Zope/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py:1.25.4.1	Sat Sep 28 21:40:33 2002
+++ Zope/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py	Tue Oct  8 14:41:08 2002
@@ -126,8 +126,8 @@
 
         comps = self.splitPath(path,obj)
 
-        if obj.meta_type != 'Folder':
-            comps = comps[:-1]
+#        if obj.meta_type != 'Folder':
+#            comps = comps[:-1]
 
         for i in range(len(comps)):
             self.insertEntry( comps[i],documentId,i)
@@ -146,7 +146,7 @@
         path = self._unindex[documentId]
         comps = path.split('/')
 
-        for level in range(len(comps[1:])-1):
+        for level in range(len(comps[1:])):
             comp = comps[level+1]
 
             self._index[comp][level].remove(documentId)
@@ -228,7 +228,7 @@
 
             results = IISet()
 
-            for level in range(0,self._depth):
+            for level in range(0,self._depth + 1):
 
                 ids = None
                 error = 0
@@ -238,7 +238,7 @@
 
                     try:
                         ids = intersection(ids,self._index[comp][level+cn])
-                    except:
+                    except KeyError:
                         error = 1
 
                 if error==0: