[Zope3-checkins] CVS: Zope3/src/zope/app/index/text - processors.py:1.4

Steve Alexander steve@cat-box.net
Thu, 6 Feb 2003 08:04:31 -0500


Update of /cvs-repository/Zope3/src/zope/app/index/text
In directory cvs.zope.org:/tmp/cvs-serv16603/src/zope/app/index/text

Modified Files:
	processors.py 
Log Message:
named adapters arrived.


=== Zope3/src/zope/app/index/text/processors.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/index/text/processors.py:1.3	Mon Dec 30 13:43:07 2002
+++ Zope3/src/zope/app/index/text/processors.py	Thu Feb  6 08:04:28 2003
@@ -19,35 +19,32 @@
 from zope.component import getAdapter
 
 from zope.textindex.textindexinterfaces import IQuerying
-from zope.app.interfaces.index.interfaces import \
-    IBatchedResult, IRankedHubIdList, IBatchedTextIndexQuery
-from zope.app.interfaces.services.query import \
-    IQueryProcessor
+from zope.app.interfaces.index.interfaces import IBatchedResult
+from zope.app.interfaces.index.interfaces import IRankedHubIdList
+from zope.app.interfaces.index.interfaces import IBatchedTextIndexQuery
+from zope.app.interfaces.services.query import IQueryProcessor
 from zope.app.index.text.queries import BatchedTextIndexQuery
 from zope.app.index.queries import BatchedRankedResult
 
-class IBatchedRankedProcessor(IQueryProcessor):
-    # XXX until named adapters are there
-    pass
-
 class BatchedRankedProcessor:
 
-    __implements__ = IBatchedRankedProcessor
+    __implements__ = IQueryProcessor
     __used_for__ = IQuerying
 
     inputInterfaces = (IBatchedTextIndexQuery,)
     outputInterfaces = (IRankedHubIdList, IBatchedResult)
 
     def __init__(self, textindex):
-        self.__textindex = textindex
+        self.textindex = textindex
 
     def __call__(self, query):
         query = getAdapter(query, IBatchedTextIndexQuery)
-        resultlist, totalresults = self.__textindex.query(query.textIndexQuery, \
-                    query.startPosition, query.batchSize)
+        resultlist, totalresults = self.textindex.query(query.textIndexQuery,
+                                                        query.startPosition,
+                                                        query.batchSize)
 
         # XXX do we need some wrapping here?
-        result = BatchedRankedResult(resultlist, query.startPosition, \
-                    query.batchSize, totalresults)
+        result = BatchedRankedResult(resultlist, query.startPosition,
+                                     query.batchSize, totalresults)
 
         return result