[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/index/text - processors.py:1.2 queries.py:1.2

Christian Theune ct@gocept.com
Wed, 4 Dec 2002 11:04:28 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/App/index/text
In directory cvs.zope.org:/tmp/cvs-serv1012

Modified Files:
	processors.py queries.py 
Log Message:
- Refactoring of components:
   Moved generic queries into the index package


=== Zope3/lib/python/Zope/App/index/text/processors.py 1.1 => 1.2 ===
--- Zope3/lib/python/Zope/App/index/text/processors.py:1.1	Wed Dec  4 06:55:15 2002
+++ Zope3/lib/python/Zope/App/index/text/processors.py	Wed Dec  4 11:04:25 2002
@@ -23,7 +23,8 @@
     IBatchedResult, IRankedHubIdList, IBatchedTextIndexQuery
 from Zope.App.OFS.Services.QueryService.IQueryProcessor import \
     IQueryProcessor
-from queries import BatchedTextIndexQuery, BatchedRankedResult
+from queries import BatchedTextIndexQuery
+from Zope.App.index.queries import BatchedRankedResult
 
 class IBatchedRankedProcessor(IQueryProcessor):
     # XXX until named adapters are there


=== Zope3/lib/python/Zope/App/index/text/queries.py 1.1 => 1.2 ===
--- Zope3/lib/python/Zope/App/index/text/queries.py:1.1	Wed Dec  4 06:55:15 2002
+++ Zope3/lib/python/Zope/App/index/text/queries.py	Wed Dec  4 11:04:25 2002
@@ -28,16 +28,3 @@
         self.textIndexQuery = query
         self.startPosition = startposition
         self.batchSize = batchsize
-
-class BatchedRankedResult:
-
-    __implements__ = IBatchedResult, IRankedHubIdList
-
-    def __init__(self, hubidlist, startposition, batchsize, totalsize):
-        self.__hubidlist = hubidlist
-        self.startPosition = startposition
-        self.batchSize = batchsize
-        self.totalSize = totalsize
-
-    def __getitem__(self, index):
-        return self.__hubidlist[index]