Merged in Jim's big fix from 2.3 branch dealing with returning the lexicon...

Merged in Jim's big fix from 2.3 branch dealing with returning the lexicon attributes of a Vocabulary object.

lib/python/Products/ZCatalog/Catalog.py

@@ -354,7 +354,9 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
             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)

lib/python/Products/ZCatalog/Vocabulary.py

@@ -158,6 +158,9 @@ class Vocabulary(Item, Persistent, Implicit,
         else:
             self.lexicon = Lexicon.Lexicon(stop_word_dict)
 
+    def getLexicon(self):
+        return self.lexicon
+
     def query(self, pattern):
         """ """
         result = []