[Zope-Checkins] CVS: Zope/lib/python/Products/ZCTextIndex - HTMLSplitter.py:1.10.34.1 Lexicon.py:1.17.34.1 ZCTextIndex.py:1.36.6.2

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/Products/ZCTextIndex
In directory cvs.zope.org:/tmp/cvs-serv5114

Modified Files:
      Tag: ajung-oneindex-multipleattributes-branch
	HTMLSplitter.py Lexicon.py ZCTextIndex.py 
Log Message:
merge from HEAD


=== Zope/lib/python/Products/ZCTextIndex/HTMLSplitter.py 1.10 => 1.10.34.1 ===
--- Zope/lib/python/Products/ZCTextIndex/HTMLSplitter.py:1.10	Thu May 23 11:05:34 2002
+++ Zope/lib/python/Products/ZCTextIndex/HTMLSplitter.py	Sun Dec 15 06:19:35 2002
@@ -21,14 +21,15 @@
 
     __implements__ = ISplitter
 
-    def process(self, text, wordpat=r"\w+"):
+    def process(self, text, wordpat=r"(?L)\w+"):
         splat = []
         for t in text:
             splat += self._split(t, wordpat)
         return splat
 
     def processGlob(self, text):
-        return self.process(text, r"\w+[\w*?]*") # see Lexicon.globToWordIds()
+        # see Lexicon.globToWordIds()
+        return self.process(text, r"(?L)\w+[\w*?]*")
 
     def _split(self, text, wordpat):
         text = text.lower()


=== Zope/lib/python/Products/ZCTextIndex/Lexicon.py 1.17 => 1.17.34.1 ===
--- Zope/lib/python/Products/ZCTextIndex/Lexicon.py:1.17	Thu May 23 11:05:34 2002
+++ Zope/lib/python/Products/ZCTextIndex/Lexicon.py	Sun Dec 15 06:19:35 2002
@@ -156,8 +156,8 @@
 class Splitter:
 
     import re
-    rx = re.compile(r"\w+")
-    rxGlob = re.compile(r"\w+[\w*?]*") # See globToWordIds() above
+    rx = re.compile(r"(?L)\w+")
+    rxGlob = re.compile(r"(?L)\w+[\w*?]*") # See globToWordIds() above
 
     def process(self, lst):
         result = []


=== Zope/lib/python/Products/ZCTextIndex/ZCTextIndex.py 1.36.6.1 => 1.36.6.2 ===
--- Zope/lib/python/Products/ZCTextIndex/ZCTextIndex.py:1.36.6.1	Sun Nov 17 06:16:04 2002
+++ Zope/lib/python/Products/ZCTextIndex/ZCTextIndex.py	Sun Dec 15 06:19:35 2002
@@ -124,7 +124,7 @@
             lexicon = getattr(aq_parent(aq_inner(self)), self.lexicon_id)
             if not ILexicon.isImplementedBy(lexicon):
                 raise TypeError('Object "%s" is not a ZCTextIndex Lexicon'
-                                % lexicon.getId())
+                                % repr(lexicon))
             self._v_lexicon = lexicon
             return lexicon