[Zope-Checkins] SVN: Zope/branches/Zope-2_8-branch/ Collector #1826: manage_convertIndexes() did not handle PathIndexes properly

[Andreas Jung]

Log message for revision 30978:
  Collector #1826: manage_convertIndexes() did not handle PathIndexes properly
  

Changed:
  U   Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
  U   Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py

-=-
Modified: Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
===================================================================
--- Zope/branches/Zope-2_8-branch/doc/CHANGES.txt	2005-07-01 21:38:17 UTC (rev 30977)
+++ Zope/branches/Zope-2_8-branch/doc/CHANGES.txt	2005-07-02 08:50:41 UTC (rev 30978)
@@ -38,18 +38,18 @@
 
       - Fixed CMFBTreeFolder for CMF 1.5+
 
-      - WebDAV COPY and MOVE did not call '_notifyOfCopyTo' and
-        '_postCopy' hooks like it was done in
-        OFS.CopySupport. Additionally added
-        'manage_changeOwnershipType' to make MOVE behave even closer
-        to OFS.CopySupport.
+      - WebDAV COPY and MOVE did not call '_notifyOfCopyTo' and '_postCopy'
+        hooks like it was done in OFS.CopySupport. Additionally added
+        'manage_changeOwnershipType' to make MOVE behave even closer to
+        OFS.CopySupport.
 
       - Collector #1548: Fix 'httplib' usage in ZPublisher.Client.
 
       - Collector #1808: manage_convertIndexes no longer tries to change the
         index types causing some trouble with CMF.
 
-      - manage_convertIndexes did not treat DateRangeIndexes properly
+      - manage_convertIndexes did not treat DateRangeIndexes and PathIndexes 
+        properly.
 
   Zope 2.8.0 (2005/06/11)
 

Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py	2005-07-01 21:38:17 UTC (rev 30977)
+++ Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py	2005-07-02 08:50:41 UTC (rev 30978)
@@ -927,11 +927,15 @@
         for idx in self.Indexes.objectValues():
             bases = [str(name) for name in idx.__class__.__bases__]
             found = False
-            for base in bases:
-                if 'UnIndex' in base:
-                    found = True
-                    break
 
+            if idx.meta_type  == 'PathIndex':
+                found = True
+            else:
+                for base in bases:
+                    if 'UnIndex' in base:
+                        found = True
+                        break
+
             if found:
                 idx_type = idx.meta_type
                 idx_id = idx.getId()