[Zope-Checkins] CVS: Zope2 - PluggableFieldIndex.py:1.1.2.3 PluggableKeywordIndex.py:1.1.2.3 PluggablePathIndex.py:1.1.2.5 PluggableTextIndex.py:1.1.2.5

[andreas@digicool.com]

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

Modified Files:
      Tag: ajung-dropin-registry
	PluggableFieldIndex.py PluggableKeywordIndex.py 
	PluggablePathIndex.py PluggableTextIndex.py 
Log Message:
removed dependecies from SearchIndex



--- Updated File PluggableFieldIndex.py in package Zope2 --
--- PluggableFieldIndex.py	2001/05/14 14:18:52	1.1.2.2
+++ PluggableFieldIndex.py	2001/05/14 17:12:02	1.1.2.3
@@ -100,8 +100,8 @@
 from BTrees.IIBTree import IITreeSet, IISet, union
 import BTrees.Length
 
-import SearchIndex.PluggableIndex 
-import SearchIndex.UnIndex
+import PluggableIndex 
+import UnIndex
 
 from Globals import Persistent, DTMLFile
 from Acquisition import Implicit
@@ -113,11 +113,11 @@
 
 _marker = []
 
-class FieldIndex(SearchIndex.PluggableIndex.PluggableIndex, Persistent,
+class FieldIndex(PluggableIndex.PluggableIndex, Persistent,
     Implicit, SimpleItem):
     """Field Indexes"""
 
-    __implements__ = (SearchIndex.PluggableIndex.PluggableIndexInterface,)
+    __implements__ = (PluggableIndex.PluggableIndexInterface,)
 
     meta_type="PluggableFieldIndex"
 

--- Updated File PluggableKeywordIndex.py in package Zope2 --
--- PluggableKeywordIndex.py	2001/05/14 17:04:04	1.1.2.2
+++ PluggableKeywordIndex.py	2001/05/14 17:12:02	1.1.2.3
@@ -93,13 +93,13 @@
 from Acquisition import Implicit
 from OFS.History import Historical
 from OFS.SimpleItem import SimpleItem
-import SearchIndex.PluggableIndex 
-import SearchIndex.UnKeywordIndex
+import PluggableIndex 
+import UnKeywordIndex
 
 
 _marker = []
 
-class KeywordIndex(SearchIndex.PluggableIndex.PluggableIndex, Persistent,
+class KeywordIndex(PluggableIndex.PluggableIndex, Persistent,
     Implicit, SimpleItem,UnIndex):
 
     
@@ -110,7 +110,7 @@
     This should have an _apply_index that returns a relevance score
     """
 
-    __implements__ = (SearchIndex.PluggableIndex.PluggableIndexInterface,)
+    __implements__ = (PluggableIndex.PluggableIndexInterface,)
 
     meta_type="PluggableKeywordIndex"
 

--- Updated File PluggablePathIndex.py in package Zope2 --
--- PluggablePathIndex.py	2001/05/14 14:18:52	1.1.2.4
+++ PluggablePathIndex.py	2001/05/14 17:12:02	1.1.2.5
@@ -85,7 +85,7 @@
 
 
 
-import SearchIndex.PluggableIndex 
+import PluggableIndex 
 
 from Globals import Persistent, DTMLFile
 from Acquisition import Implicit
@@ -101,13 +101,13 @@
 
 _marker = []
 
-class PathIndex(SearchIndex.PluggableIndex.PluggableIndex, Persistent,
+class PathIndex(PluggableIndex.PluggableIndex, Persistent,
     Implicit, SimpleItem):
     """ A path index stores all path components of the physical 
     path of an object: 
     """
 
-    __implements__ = (SearchIndex.PluggableIndex.PluggableIndexInterface,)
+    __implements__ = (PluggableIndex.PluggableIndexInterface,)
 
     meta_type="PluggablePathIndex"
 

--- Updated File PluggableTextIndex.py in package Zope2 --
--- PluggableTextIndex.py	2001/05/14 17:04:04	1.1.2.4
+++ PluggableTextIndex.py	2001/05/14 17:12:02	1.1.2.5
@@ -99,10 +99,10 @@
 
 from Globals import Persistent,DTMLFile
 from Acquisition import Implicit
-from SearchIndex.Splitter import Splitter
+from Splitter import Splitter
 from zLOG import LOG, ERROR
-from SearchIndex.Lexicon import Lexicon
-from SearchIndex.ResultList import ResultList
+from Lexicon import Lexicon
+from ResultList import ResultList
 from OFS.SimpleItem import SimpleItem
 from types import *
 
@@ -112,9 +112,9 @@
 from BTrees.IIBTree import difference, weightedIntersection
 
 
-import SearchIndex.PluggableIndex
-from SearchIndex.Lexicon import Lexicon, stop_word_dict
-from SearchIndex.ResultList import ResultList
+import PluggableIndex
+from Lexicon import Lexicon, stop_word_dict
+from ResultList import ResultList
 
 
 
@@ -126,7 +126,7 @@
 
 
 
-class TextIndex(SearchIndex.PluggableIndex.PluggableIndex, Persistent,
+class TextIndex(PluggableIndex.PluggableIndex, Persistent,
     Implicit, SimpleItem):
 
     """Full-text index.
@@ -147,7 +147,7 @@
     This isn't exactly how things are represented in memory, many
     optimizations happen along the way."""
 
-    __implements__ = (SearchIndex.PluggableIndex.PluggableIndexInterface,)
+    __implements__ = (PluggableIndex.PluggableIndexInterface,)
 
     meta_type='PluggableTextIndex'