[Zope-Checkins] CVS: Zope2 - GlobbingLexicon.py:1.1.2.2 Lexicon.py:1.1.2.4 TextIndex.py:1.1.2.6

[andreas@digicool.com]

Update of /cvs-repository/Zope2/lib/python/Products/PluginIndexes/TextIndex
In directory korak.digicool.com:/tmp/cvs-serv4152

Modified Files:
      Tag: ajung-dropin-registry
	GlobbingLexicon.py Lexicon.py TextIndex.py 
Log Message:
misc changes



--- Updated File GlobbingLexicon.py in package Zope2 --
--- GlobbingLexicon.py	2001/05/16 15:29:43	1.1.2.1
+++ GlobbingLexicon.py	2001/05/16 16:09:13	1.1.2.2
@@ -85,7 +85,7 @@
 
 from Lexicon import Lexicon
 from Splitter import Splitter
-from UnTextIndex import Or
+from Products.PluginIndexes.TextIndex.TextIndex import Or
 
 import re, string
 

--- Updated File Lexicon.py in package Zope2 --
--- Lexicon.py	2001/05/15 13:34:09	1.1.2.3
+++ Lexicon.py	2001/05/16 16:09:13	1.1.2.4
@@ -89,7 +89,7 @@
 
 """
 
-from Splitter import DefaultSplitter as Splitter
+import Splitter
 from Persistence import Persistent
 from Acquisition import Implicit
 
@@ -122,15 +122,9 @@
             self.stop_syn = stop_syn
 
         if useSplitter:
-            try:
-                del Splitter
-            except:
-                print 'Splitter won\'t die'
-
-            exec('from %s import Splitter ' % useSplitter)
-    
+            self.SplitterFunc = Splitter.getSplitter(useSplitter)
         else:
-            exec('from %s import Splitter ' % availableSplitters[0])
+            self.SplitterFunc = Splitter.getSplitter()
             
 
 
@@ -229,7 +223,7 @@
         """ wrap the splitter """
         if words is None:
             words = self.stop_syn
-        return Splitter(astring, words)
+        return self.SplitterFunc(astring, words)
 
 
     def query_hook(self, q):

--- Updated File TextIndex.py in package Zope2 --
--- TextIndex.py	2001/05/15 14:48:12	1.1.2.5
+++ TextIndex.py	2001/05/16 16:09:13	1.1.2.6
@@ -110,7 +110,7 @@
 
 
 from Products.PluginIndexes import PluggableIndex 
-from Products.PluginIndexes import ResultList
+from Products.PluginIndexes.common.ResultList import ResultList
 from Splitter import availableSplitters
 from Lexicon  import Lexicon, stop_word_dict