Port interface check fix from 2.6 branch. This should now work

with new Zope3 interfaces

lib/python/Products/ZCatalog/dtml/catalogIndexes.dtml

@@ -151,12 +151,10 @@ function toggleSelect() {
 
     <td>
     <div class="list-item">
-      <dtml-if "_.string.find(_.str(_.getattr(this(),'__implements__','old')),'PluggableIndex')>-1">
-        &dtml-meta_type;
-      <dtml-else>
+      <dtml-var meta_type>
+      <dtml-if isDeprecatedIndex>
          <dtml-call "REQUEST.set('oldidx',1)">
          (pre-2.4 index)
-         &dtml-meta_type;
       </dtml-if>
     </div>
     </td>

lib/python/SearchIndex/Index.py

@@ -12,7 +12,7 @@
 ##############################################################################
 
 """Simple column indices"""
-__version__='$Revision: 1.30 $'[11:-2]
+__version__='$Revision: 1.31 $'[11:-2]
 
 from Persistence import Persistent
 from BTrees.OOBTree import OOBTree
@@ -36,6 +36,8 @@ def nonEmpty(s):
 
 class Index(Persistent):
     """Index object interface"""
+    
+    isDeprecatedIndex = 1
 
     def __init__(self, data=None, schema=None, id=None,
                  ignore_ex=None, call_methods=None):

lib/python/SearchIndex/TextIndex.py

@@ -130,7 +130,7 @@ Notes on a new text index design
        space.
 
 """
-__version__='$Revision: 1.31 $'[11:-2]
+__version__='$Revision: 1.32 $'[11:-2]
 
 #XXX I strongly suspect that this is broken, but I'm not going to fix it. :(
 
@@ -146,6 +146,8 @@ from Lexicon import Lexicon, stop_word_dict
 from ResultList import ResultList
 
 class TextIndex(Persistent):
+    
+    isDeprecatedIndex = 1
 
     def __init__(self, data=None, schema=None, id=None,
                  ignore_ex=None, call_methods=None):

lib/python/SearchIndex/UnIndex.py

@@ -13,7 +13,7 @@
 
 """Simple column indices"""
 
-__version__='$Revision: 1.32 $'[11:-2]
+__version__='$Revision: 1.33 $'[11:-2]
 
 from Globals import Persistent
 from Acquisition import Implicit
@@ -36,6 +36,8 @@ class UnIndex(Persistent, Implicit):
     """UnIndex object interface"""
 
     meta_type = 'Field Index'
+    
+    isDeprecatedIndex = 1
 
     def __init__(self, id, ignore_ex=None, call_methods=None):
         """Create an unindex

lib/python/SearchIndex/UnTextIndex.py

@@ -19,7 +19,7 @@ undo information so that objects can be unindexed when the old value
 is no longer known.
 """
 
-__version__ = '$Revision: 1.53 $'[11:-2]
+__version__ = '$Revision: 1.54 $'[11:-2]
 
 
 import string, re
@@ -64,6 +64,8 @@ class UnTextIndex(Persistent, Implicit):
 
     This isn't exactly how things are represented in memory, many
     optimizations happen along the way."""
+    
+    isDeprecatedIndex = 1
 
     meta_type = 'Text Index'