Log message for revision 101458: - removed deprecated TextIndex Changed: U Zope/trunk/setup.py U Zope/trunk/src/Products/PluginIndexes/README.txt D Zope/trunk/src/Products/PluginIndexes/TextIndex/ UU Zope/trunk/src/Products/PluginIndexes/__init__.py U Zope/trunk/src/Products/PluginIndexes/interfaces.py
-=- Modified: Zope/trunk/setup.py =================================================================== --- Zope/trunk/setup.py 2009-07-03 15:32:49 UTC (rev 101457) +++ Zope/trunk/setup.py 2009-07-03 15:33:10 UTC (rev 101458) @@ -76,21 +76,6 @@ # indexes Extension( - name='Products.PluginIndexes.TextIndex.Splitter.' - 'ZopeSplitter.ZopeSplitter', - sources=['src/Products/PluginIndexes/TextIndex/Splitter/' - 'ZopeSplitter/src/ZopeSplitter.c']), - Extension( - name='Products.PluginIndexes.TextIndex.Splitter.' - 'ISO_8859_1_Splitter.ISO_8859_1_Splitter', - sources=['src/Products/PluginIndexes/TextIndex/Splitter/' - 'ISO_8859_1_Splitter/src/ISO_8859_1_Splitter.c']), - Extension( - name='Products.PluginIndexes.TextIndex.Splitter.' - 'UnicodeSplitter.UnicodeSplitter', - sources=['src/Products/PluginIndexes/TextIndex/Splitter/' - 'UnicodeSplitter/src/UnicodeSplitter.c']), - Extension( name='Products.ZCTextIndex.stopper', sources=['src/Products/ZCTextIndex/stopper.c']), Extension( Modified: Zope/trunk/src/Products/PluginIndexes/README.txt =================================================================== --- Zope/trunk/src/Products/PluginIndexes/README.txt 2009-07-03 15:32:49 UTC (rev 101457) +++ Zope/trunk/src/Products/PluginIndexes/README.txt 2009-07-03 15:33:10 UTC (rev 101458) @@ -47,34 +47,8 @@ - new index type - Changes to TextIndex: - - - ZMI allows to select a different vocabulary. To use a vocabulary different - from the ZCatalogs default vocabulary 'Vocabulary' you must create a new - Vocabulary through the ZMI of the ZCatalog. After creating the vocabulary you - can choose the vocabulary on the ZMI management screen for the text index. - - - the default operator might be overridden by specifying a new one - as 'operator' (see below) - - - removed direct dependency from Splitter module. Splitter is now - acquired from used vocabulary - - - usage of the 'textindex_operator' is deprecated - - - lots of internal rework - - -Changes to Vocabulary: - - - added Splitter selection on the add formular - - Changes to ZCatalog - - Vocabulary.py moved to Products/PluginIndexes/TextIndex. A wrapper - for backward compatibility is in place - - added ZCatalogIndexes.py to provide access to indexes with pluggable index interface Modified: Zope/trunk/src/Products/PluginIndexes/__init__.py =================================================================== --- Zope/trunk/src/Products/PluginIndexes/__init__.py 2009-07-03 15:32:49 UTC (rev 101457) +++ Zope/trunk/src/Products/PluginIndexes/__init__.py 2009-07-03 15:33:10 UTC (rev 101458) @@ -21,20 +21,7 @@ from Products.PluginIndexes.common import ResultList from Products.PluginIndexes.common import UnIndex -# BBB: TextIndex is deprecated but we don't want the warning to appear here -import warnings -warnings.filterwarnings('ignore', message='^Using TextIndex', append=1) -try: - import TextIndex.TextIndex -finally: - del warnings.filters[-1] - try: - del __warningregistry__ - except NameError: - pass - -_indexes = ('TextIndex', - 'KeywordIndex', +_indexes = ('KeywordIndex', 'FieldIndex', 'PathIndex', 'TopicIndex', Property changes on: Zope/trunk/src/Products/PluginIndexes/__init__.py ___________________________________________________________________ Deleted: cvs2svn:cvs-rev - 1.13 Added: svn:keywords + Id Modified: Zope/trunk/src/Products/PluginIndexes/interfaces.py =================================================================== --- Zope/trunk/src/Products/PluginIndexes/interfaces.py 2009-07-03 15:32:49 UTC (rev 101457) +++ Zope/trunk/src/Products/PluginIndexes/interfaces.py 2009-07-03 15:33:10 UTC (rev 101458) @@ -160,38 +160,8 @@ """ -class IVocabulary(Interface): - - """A Vocabulary is a user-managable realization of a Lexicon object. - """ - - -class ITextIndex(Interface): - - """Full-text index. - - There is a ZCatalog UML model that sheds some light on what is - going on here. '_index' is a BTree which maps word ids to mapping - from document id to score. Something like: - - {'bob' : {1 : 5, 2 : 3, 42 : 9}} - {'uncle' : {1 : 1}} - - The '_unindex' attribute is a mapping from document id to word - ids. This mapping allows the catalog to unindex an object: - - {42 : ('bob', 'is', 'your', 'uncle') - - This isn't exactly how things are represented in memory, many - optimizations happen along the way. - """ - - def getLexicon(vocab_id=None): - """Get the Lexicon in use. - """ - - class IFilteredSet(Interface): + """A pre-calculated result list based on an expression. """ _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins