[Zope3-checkins] CVS: Zope3/src/zope/textindex - baseindex.py:1.5 cosineindex.py:1.4 htmlsplitter.py:1.4 lexicon.py:1.5 nbest.py:1.4 okapiindex.py:1.4 parsetree.py:1.4 pipelinefactory.py:1.4 queryparser.py:1.4 textindexwrapper.py:1.4 iindex.py:NONE ilexicon.py:NONE inbest.py:NONE ipipelineelement.py:NONE ipipelineelementfactory.py:NONE iqueryparser.py:NONE iqueryparsetree.py:NONE isplitter.py:NONE textindexinterfaces.py:NONE

[Andy Hird]

Update of /cvs-repository/Zope3/src/zope/textindex
In directory cvs.zope.org:/tmp/cvs-serv24050/src/zope/textindex

Modified Files:
	baseindex.py cosineindex.py htmlsplitter.py lexicon.py 
	nbest.py okapiindex.py parsetree.py pipelinefactory.py 
	queryparser.py textindexwrapper.py 
Removed Files:
	iindex.py ilexicon.py inbest.py ipipelineelement.py 
	ipipelineelementfactory.py iqueryparser.py iqueryparsetree.py 
	isplitter.py textindexinterfaces.py 
Log Message:
Index-Interface-Geddon. Moving all the index interfaces to 
zope.index.interfaces

As part of this we removed several duplicate interfaces and cleaned up
some existing ones. Most users of index interfaces should only need
zope.index.interfaces.index


=== Zope3/src/zope/textindex/baseindex.py 1.4 => 1.5 ===
--- Zope3/src/zope/textindex/baseindex.py:1.4	Tue Jun  3 11:32:37 2003
+++ Zope3/src/zope/textindex/baseindex.py	Sun Jul 13 01:51:24 2003
@@ -25,7 +25,8 @@
 from zodb.btrees.IIBTree import intersection, difference
 from zodb.btrees import Length
 
-from zope.textindex.iindex import IIndex
+from zope.index.interfaces.index import IInjection, IStatistics, \
+    IExtendedQuerying
 from zope.textindex import widcode
 from zope.textindex.setops import mass_weightedIntersection, \
                                   mass_weightedUnion
@@ -52,7 +53,7 @@
     return IITreeSet(L).keys()
 
 class BaseIndex(Persistent):
-    implements(IIndex)
+    implements(IInjection, IStatistics, IExtendedQuerying)
 
     def __init__(self, lexicon):
         self._lexicon = lexicon


=== Zope3/src/zope/textindex/cosineindex.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/cosineindex.py:1.3	Tue Jun  3 11:32:37 2003
+++ Zope3/src/zope/textindex/cosineindex.py	Sun Jul 13 01:51:24 2003
@@ -19,14 +19,11 @@
 from zodb.btrees.IIBTree import IIBucket
 from zope.interface import implements
 
-from zope.textindex.iindex import IIndex
 from zope.textindex.baseindex import BaseIndex, \
                                      inverse_doc_frequency, \
                                      scaled_int, SCALE_FACTOR
 
 class CosineIndex(BaseIndex):
-
-    implements(IIndex)
 
     def __init__(self, lexicon):
         BaseIndex.__init__(self, lexicon)


=== Zope3/src/zope/textindex/htmlsplitter.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/htmlsplitter.py:1.3	Tue Jun  3 11:32:37 2003
+++ Zope3/src/zope/textindex/htmlsplitter.py	Sun Jul 13 01:51:24 2003
@@ -16,7 +16,7 @@
 
 from zope.interface import implements
 
-from zope.textindex.isplitter import ISplitter
+from zope.index.interfaces.splitter import ISplitter
 from zope.textindex.pipelinefactory import element_factory
 
 


=== Zope3/src/zope/textindex/lexicon.py 1.4 => 1.5 ===
--- Zope3/src/zope/textindex/lexicon.py:1.4	Mon Jun 30 14:17:53 2003
+++ Zope3/src/zope/textindex/lexicon.py	Sun Jul 13 01:51:24 2003
@@ -21,7 +21,7 @@
 
 from persistence import Persistent
 
-from zope.textindex.ilexicon import ILexicon
+from zope.index.interfaces.lexicon import ILexicon
 from zope.textindex.stopdict import get_stopdict
 from zope.textindex.parsetree import QueryError
 from zope.textindex.pipelinefactory import element_factory


=== Zope3/src/zope/textindex/nbest.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/nbest.py:1.3	Tue Jun  3 11:32:37 2003
+++ Zope3/src/zope/textindex/nbest.py	Sun Jul 13 01:51:24 2003
@@ -20,7 +20,7 @@
 
 from bisect import bisect_left as bisect
 
-from zope.textindex.inbest import INBest
+from zope.index.interfaces.nbest import INBest
 from zope.interface import implements
 
 class NBest:


=== Zope3/src/zope/textindex/okapiindex.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/okapiindex.py:1.3	Tue Jun  3 11:32:37 2003
+++ Zope3/src/zope/textindex/okapiindex.py	Sun Jul 13 01:51:24 2003
@@ -19,14 +19,11 @@
 
 from zodb.btrees.IIBTree import IIBucket
 
-from zope.textindex.iindex import IIndex
 from zope.textindex.baseindex import \
      BaseIndex, inverse_doc_frequency, scaled_int
 from zope.interface import implements
 
 class OkapiIndex(BaseIndex):
-
-    implements(IIndex)
 
     # BM25 free parameters.
     K1 = 1.2


=== Zope3/src/zope/textindex/parsetree.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/parsetree.py:1.3	Tue Jun  3 11:32:37 2003
+++ Zope3/src/zope/textindex/parsetree.py	Sun Jul 13 01:51:24 2003
@@ -16,7 +16,7 @@
 
 from zodb.btrees.IIBTree import difference
 
-from zope.textindex.iqueryparsetree import IQueryParseTree
+from zope.index.interfaces.queryparsetree import IQueryParseTree
 from zope.textindex.setops import mass_weightedIntersection, \
                                   mass_weightedUnion
 


=== Zope3/src/zope/textindex/pipelinefactory.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/pipelinefactory.py:1.3	Tue Jun  3 11:32:37 2003
+++ Zope3/src/zope/textindex/pipelinefactory.py	Sun Jul 13 01:51:24 2003
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-from zope.textindex.ipipelineelementfactory import IPipelineElementFactory
+from zope.index.interfaces.pipelineelementfactory import IPipelineElementFactory
 from zope.interface import implements
 
 class PipelineElementFactory:


=== Zope3/src/zope/textindex/queryparser.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/queryparser.py:1.3	Tue Jun  3 11:32:37 2003
+++ Zope3/src/zope/textindex/queryparser.py	Sun Jul 13 01:51:24 2003
@@ -58,7 +58,7 @@
 import re
 from zope.interface import implements
 
-from zope.textindex.iqueryparser import IQueryParser
+from zope.index.interfaces.queryparser import IQueryParser
 from zope.textindex import parsetree
 
 # Create unique symbols for token types.


=== Zope3/src/zope/textindex/textindexwrapper.py 1.3 => 1.4 ===
--- Zope3/src/zope/textindex/textindexwrapper.py:1.3	Tue Jun  3 11:32:37 2003
+++ Zope3/src/zope/textindex/textindexwrapper.py	Sun Jul 13 01:51:24 2003
@@ -27,7 +27,7 @@
 from zope.textindex.queryparser import QueryParser
 from zope.textindex.nbest import NBest
 
-from zope.textindex.textindexinterfaces import \
+from zope.index.interfaces.index import \
      IInjection, IQuerying, IStatistics
 
 class TextIndexWrapper(Persistent):

=== Removed File Zope3/src/zope/textindex/iindex.py ===

=== Removed File Zope3/src/zope/textindex/ilexicon.py ===

=== Removed File Zope3/src/zope/textindex/inbest.py ===

=== Removed File Zope3/src/zope/textindex/ipipelineelement.py ===

=== Removed File Zope3/src/zope/textindex/ipipelineelementfactory.py ===

=== Removed File Zope3/src/zope/textindex/iqueryparser.py ===

=== Removed File Zope3/src/zope/textindex/iqueryparsetree.py ===

=== Removed File Zope3/src/zope/textindex/isplitter.py ===

=== Removed File Zope3/src/zope/textindex/textindexinterfaces.py ===