Rename the Index classes to OkapiIndex and CosineIndex, respectively.

lib/python/Products/ZCTextIndex/ZCTextIndex.py

@@ -27,7 +27,7 @@ from Products.PluginIndexes.common.PluggableIndex \
      import PluggableIndexInterface
 from Products.PluginIndexes.common.util import parseIndexRequest
 
-from Products.ZCTextIndex.OkapiIndex import Index
+from Products.ZCTextIndex.OkapiIndex import OkapiIndex
 from Products.ZCTextIndex.ILexicon import ILexicon
 from Products.ZCTextIndex.Lexicon \
      import Lexicon, Splitter, CaseNormalizer, StopWordRemover
@@ -47,7 +47,7 @@ class ZCTextIndex(Persistent, Acquisition.Implicit, SimpleItem):
 
     query_options = ['query']
 
-    def __init__(self, id, extra, caller, index_factory=Index):
+    def __init__(self, id, extra, caller, index_factory=OkapiIndex):
         self.id = id
         self._fieldname = extra.doc_attr
         lexicon = getattr(caller, extra.lexicon_id, None)

lib/python/Products/ZCTextIndex/tests/mhindex.py

@@ -22,7 +22,7 @@ from BTrees.IOBTree import IOBTree
 from BTrees.OIBTree import OIBTree
 
 from Products.ZCTextIndex.NBest import NBest
-from Products.ZCTextIndex.OkapiIndex import OkapiIndex as Index
+from Products.ZCTextIndex.OkapiIndex import OkapiIndex
 from Products.ZCTextIndex.Lexicon import Lexicon, Splitter
 from Products.ZCTextIndex.Lexicon import CaseNormalizer, StopWordRemover
 from Products.ZCTextIndex.QueryParser import QueryParser
@@ -382,7 +382,7 @@ class TextIndex(Persistent):
 
     def __init__(self):
         self.lexicon = Lexicon(Splitter(), CaseNormalizer(), StopWordRemover())
-        self.index = Index(self.lexicon)
+        self.index = OkapiIndex(self.lexicon)
 
     def index_text(self, docid, text):
         self.index.index_doc(docid, text)