Collector #126/131: merges fixes from 2.5 trunk

lib/python/Products/PluginIndexes/TextIndex/GlobbingLexicon.py

@@ -237,7 +237,10 @@ class GlobbingLexicon(Lexicon):
         ## don't do anything, less efficient but there's not much
         ## 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):

lib/python/Products/PluginIndexes/TextIndex/Lexicon.py

@@ -155,7 +155,10 @@ class Lexicon(Persistent, Implicit):
         """ wrap the splitter """
         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):