[Zope-Checkins] CVS: Zope/lib/python/Products/PluginIndexes/TextIndex - GlobbingLexicon.py:1.11 Lexicon.py:1.6

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/Products/PluginIndexes/TextIndex
In directory cvs.zope.org:/tmp/cvs-serv28173

Modified Files:
	GlobbingLexicon.py Lexicon.py 
Log Message:
Collector #126/131: merges fixes from 2.5 trunk


=== Zope/lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py 1.10 => 1.11 ===
         ## sense in stemming a globbing lexicon.
 
-        return self.SplitterFunc(astring,None,encoding)
+        try:
+            return self.SplitterFunc(astring,None,encoding)
+        except:
+            return self.SplitterFunc(astring,None)
 
 
     def createRegex(self, pat):


=== Zope/lib/python/Products/PluginIndexes/TextIndex/Lexicon.py 1.5 => 1.6 ===
         if words is None:
             words = self.stop_syn
-        return self.SplitterFunc(astring, words, encoding)
+        try:
+            return self.SplitterFunc(astring, words, encoding)
+        except:
+            return self.SplitterFunc(astring, words)
 
 
     def query_hook(self, q):