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

andreas@serenade.digicool.com andreas@serenade.digicool.com
Fri, 18 May 2001 10:09:00 -0400


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

Modified Files:
      Tag: ajung-dropin-registry
	TextIndex.py 
Log Message:
added manage_workspace



--- Updated File TextIndex.py in package Zope2 --
--- TextIndex.py	2001/05/18 13:27:54	1.1.2.10
+++ TextIndex.py	2001/05/18 14:08:59	1.1.2.11
@@ -110,10 +110,8 @@
 from BTrees.IIBTree import difference, weightedIntersection
 
 from Lexicon import Lexicon
-from Splitter import Splitter
+import Splitter
 
-from Splitter import availableSplitters
-
 from types import *
 
 AndNot      = 'andnot'
@@ -181,7 +179,7 @@
 
 
         # Default Splitter
-        self.availableSplitters = availableSplitters
+        self.availableSplitters = Splitter.availableSplitters
         self.useSplitter        = self.availableSplitters[0][0]
 
         # Default text index operator (should be visible to ZMI)
@@ -355,7 +353,7 @@
             return 0
         
         lexicon = self.getLexicon(self._lexicon)
-        splitter=lexicon.Splitter
+        splitter = Splitter.getSplitter(self.useSplitter)
 
         wordScores = OIBTree()
         last = None
@@ -530,7 +528,7 @@
         print 'equal', self.operators[self.useOperator]==Or
         assert  self.operators[self.useOperator]==Or
 
-        print dir(self)
+#        print dir(self)
 
 #        query_operator = self.operators[self.useOperator]
 
@@ -697,6 +695,9 @@
         if (len(query) != 1): raise QueryError, "Malformed query"
 
         return query[0]
+
+
+    manage_workspace = DTMLFile("dtml/manageTextIndex",globals())
 
 
 def parse(s):