You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pylucene-commits@lucene.apache.org by va...@apache.org on 2010/04/18 02:01:27 UTC

svn commit: r935277 - in /lucene/pylucene/trunk: CHANGES python/ICUNormalizer2Filter.py test/test_ICUNormalizer2Filter.py

Author: vajda
Date: Sun Apr 18 00:01:27 2010
New Revision: 935277

URL: http://svn.apache.org/viewvc?rev=935277&view=rev
Log:
 - added port of ICUNormalizer2Filter using C++ ICU's Normalizer2 via PyICU

Modified:
    lucene/pylucene/trunk/CHANGES
    lucene/pylucene/trunk/python/ICUNormalizer2Filter.py
    lucene/pylucene/trunk/test/test_ICUNormalizer2Filter.py

Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=935277&r1=935276&r2=935277&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Sun Apr 18 00:01:27 2010
@@ -3,7 +3,7 @@ Version 3.0.0 ->
 ----------------
  - improved support for building on Windows with mingw32
  - added wininst target to Makefile
- - added port of ICUNormalizer2Filter that uses C++ ICU's Normalizer2 via PyICU
+ - added port of ICUNormalizer2Filter using C++ ICU's Normalizer2 via PyICU
  - 
 
 Version 2.9.0 -> 3.0.0

Modified: lucene/pylucene/trunk/python/ICUNormalizer2Filter.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/python/ICUNormalizer2Filter.py?rev=935277&r1=935276&r2=935277&view=diff
==============================================================================
--- lucene/pylucene/trunk/python/ICUNormalizer2Filter.py (original)
+++ lucene/pylucene/trunk/python/ICUNormalizer2Filter.py Sun Apr 18 00:01:27 2010
@@ -49,7 +49,7 @@ class ICUNormalizer2Filter(PythonTokenFi
         self.termAtt = self.addAttribute(CharTermAttribute.class_);
 
         if normalizer is None:
-            normalizer = Normalizer2.getInstance(None, "nfkc_cf", UNormalizationMode2.UNORM2_COMPOSE)
+            normalizer = Normalizer2.getInstance(None, "nfkc_cf", UNormalizationMode2.COMPOSE)
         self.normalizer = normalizer
 
     def incrementToken(self):
@@ -57,7 +57,7 @@ class ICUNormalizer2Filter(PythonTokenFi
         if self.input.incrementToken():
             text = self.termAtt.toString()
 
-            if self.normalizer.quickCheck(text) != UNormalizationCheckResult.UNORM_YES:
+            if self.normalizer.quickCheck(text) != UNormalizationCheckResult.YES:
                 self.termAtt.setEmpty()
                 self.termAtt.append(self.normalizer.normalize(text))
                 

Modified: lucene/pylucene/trunk/test/test_ICUNormalizer2Filter.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test/test_ICUNormalizer2Filter.py?rev=935277&r1=935276&r2=935277&view=diff
==============================================================================
--- lucene/pylucene/trunk/test/test_ICUNormalizer2Filter.py (original)
+++ lucene/pylucene/trunk/test/test_ICUNormalizer2Filter.py Sun Apr 18 00:01:27 2010
@@ -64,7 +64,7 @@ class TestICUNormalizer2Filter(BaseToken
             # specify nfc with decompose to get nfd
             def tokenStream(_self, fieldName, reader):
                 return ICUNormalizer2Filter(WhitespaceTokenizer(Version.LUCENE_CURRENT, reader),
-                                            Normalizer2.getInstance(None, "nfc", UNormalizationMode2.UNORM2_DECOMPOSE))
+                                            Normalizer2.getInstance(None, "nfc", UNormalizationMode2.DECOMPOSE))
 
         a = analyzer()
         # decompose EAcute into E + combining Acute