[Zope-Checkins] CVS: Zope2 - TextIndex.py:1.3

[andreas@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/Products/PluginIndexes/TextIndex
In directory serenade:/tmp/cvs-serv22362

Modified Files:
	TextIndex.py 
Log Message:
Text Index does not know anymore about the available splitters.
The splitter is now aquired from the used vocabulary.



--- Updated File TextIndex.py in package Zope2 --
--- TextIndex.py	2001/05/30 15:57:33	1.2
+++ TextIndex.py	2001/05/30 19:29:18	1.3
@@ -110,7 +110,6 @@
 from BTrees.IIBTree import difference, weightedIntersection
 
 from Lexicon import Lexicon
-import Splitter
 
 from types import *
 
@@ -174,10 +173,6 @@
         self.call_methods = call_methods
 
 
-        # Default Splitter
-        self.availableSplitters = Splitter.availableSplitters
-        self.useSplitter        = self.availableSplitters[0][0]
-
         # Default text index operator (should be visible to ZMI)
         self.operators = { 'andnot':AndNot, 'and':And,
                             'near':Near, 'or':Or }
@@ -352,7 +347,7 @@
             return 0
         
         lexicon = self.getLexicon()
-        splitter = Splitter.getSplitter(self.useSplitter)
+        splitter = lexicon.Splitter
 
         wordScores = OIBTree()
         last = None
@@ -686,8 +681,6 @@
                                REQUEST=None,RESPONSE=None,URL2=None):
         """ preferences of TextIndex """
 
-#        self.useSplitter = splitter
-#       self.useOperator = text_operator
 
         if self.vocabulary_id != vocabulary:
             self.clear()