[Zope-Checkins] CVS: Zope2 - Catalog.py:1.66

[chrism@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/Products/ZCatalog
In directory serenade:/slab/home/chrism/sandboxes/TrunkBranch/lib/python/Products/ZCatalog

Modified Files:
	Catalog.py 
Log Message:
Merged in Jim's big fix from 2.3 branch dealing with returning the lexicon attributes of a Vocabulary object.



--- Updated File Catalog.py in package Zope2 --
--- Catalog.py	2001/03/17 19:03:18	1.65
+++ Catalog.py	2001/03/19 19:26:06	1.66
@@ -354,7 +354,9 @@
             indexes[name] = UnIndex.UnIndex(name)
         elif index_type == 'TextIndex':
             lexicon=self.lexicon
-            if type(lexicon) is type(''): lexicon=getattr(self, lexicon)
+            if type(lexicon) is type(''):
+                lexicon=getattr(self, lexicon).getLexicon()
+                
             indexes[name] = UnTextIndex.UnTextIndex(name, None, None, lexicon)
         elif index_type == 'KeywordIndex':
             indexes[name] = UnKeywordIndex.UnKeywordIndex(name)