[Zope-Checkins] CVS: Zope2 - Catalog.py:1.70.6.6 Vocabulary.py:1.13.26.1 ZCatalog.py:1.88.6.14

[Andreas Jung]

Update of /cvs-repository/Zope2/lib/python/Products/ZCatalog
In directory yetix:/work/sandboxes/ajung-dropin-registry/lib/python/Products/ZCatalog

Modified Files:
      Tag: ajung-dropin-registry
	Catalog.py Vocabulary.py ZCatalog.py 
Log Message:
removed dependancies from SearchIndex stuff
(uses now Products.PluginIndexes)



--- Updated File Catalog.py in package Zope2 --
--- Catalog.py	2001/05/21 21:34:57	1.70.6.5
+++ Catalog.py	2001/05/23 16:37:47	1.70.6.6
@@ -86,8 +86,7 @@
 from Persistence import Persistent
 import Acquisition
 import ExtensionClass
-from SearchIndex import UnIndex, UnTextIndex, UnKeywordIndex
-from SearchIndex.Lexicon import Lexicon
+from Products.PluginIndexes.common.Lexicon import Lexicon
 from MultiMapping import MultiMapping
 from string import lower
 import Record
@@ -101,7 +100,7 @@
 from BTrees.OIBTree import OIBTree
 from BTrees.IOBTree import IOBTree
 import BTrees.Length
-from SearchIndex.randid import randid
+from Products.PluginIndexes.common.randid import randid
 
 import time
 

--- Updated File Vocabulary.py in package Zope2 --
--- Vocabulary.py	2001/03/19 19:26:17	1.13
+++ Vocabulary.py	2001/05/23 16:37:48	1.13.26.1
@@ -89,9 +89,8 @@
 from Acquisition import Implicit
 from Persistence import Persistent
 from OFS.SimpleItem import Item
-from SearchIndex import Lexicon, GlobbingLexicon
-
-from SearchIndex.Lexicon import stop_word_dict
+from Products.PluginIndexes.common import Lexicon, GlobbingLexicon
+from Products.PluginIndexes.common.Lexicon import stop_word_dict
 
 manage_addVocabularyForm=DTMLFile('dtml/addVocabulary',globals())
 

--- Updated File ZCatalog.py in package Zope2 --
--- ZCatalog.py	2001/05/23 16:00:24	1.88.6.13
+++ ZCatalog.py	2001/05/23 16:37:48	1.88.6.14
@@ -237,10 +237,12 @@
         self._v_total = 0
 
         if vocab_id is None:
+            print "we create a new vocabulary"
             v = Vocabulary('Vocabulary', 'Vocabulary', globbing=1)
             self._setObject('Vocabulary', v)
             self.vocab_id = 'Vocabulary'
         else:
+            print "no new vocabulary"
             self.vocab_id = vocab_id
 
         self._catalog = Catalog(vocabulary=self.vocab_id)