cvs commit: jahia/core/src/java/org/jahia/services/search/analyzer LanguageIndependantFilter.java StandardAnalyzer.java

[Khue Nguyen]

knguyen     2005/12/19 17:16:47 CET

  Modified files:
    core/src/java/org/jahia/services/search/analyzer 
                                                     
LanguageIndependantFilter.java 
                                                     StandardAnalyzer.java 
  Log:
  search é à completed
  
  Revision  Changes    Path
  1.2       +14 -0     
jahia/core/src/java/org/jahia/services/search/analyzer/LanguageIndependantFilter.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/analyzer/LanguageIndependantFilter.java.diff?r1=1.1&r2=1.2&f=h
  1.3       +2 -3      
jahia/core/src/java/org/jahia/services/search/analyzer/StandardAnalyzer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/analyzer/StandardAnalyzer.java.diff?r1=1.2&r2=1.3&f=h
  
  
  
  Index: LanguageIndependantFilter.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/analyzer/LanguageIndependantFilter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LanguageIndependantFilter.java    19 Dec 2005 15:45:00 -0000      1.1
  +++ LanguageIndependantFilter.java    19 Dec 2005 16:16:46 -0000      1.2
  @@ -15,6 +15,8 @@
   public class LanguageIndependantFilter extends TokenFilter
           implements StandardTokenizerConstants {
   
  +    private org.apache.lucene.analysis.Token cleanToken;
  +
       char[] filteredChars = new char[]{'á', 'à', 'â', 'é', 'è', 'ê', 'ô', 
'ù'};
   
       char[] replacedChars = new char[]{'a', 'a', 'a', 'e', 'e', 'e', 'o', 
'u'};
  @@ -25,6 +27,11 @@
       }
   
       public final org.apache.lucene.analysis.Token next() throws IOException {
  +        if ( cleanToken != null ){
  +            Token tempToken = cleanToken;
  +            cleanToken = null;
  +            return tempToken;
  +        }
           Token t = input.next();
           if (t == null) {
               return null;
  @@ -48,7 +55,14 @@
                   trimmed.append(c);
               }
           }
  +        if ( !text.equals(trimmed.toString()) ){
  +            cleanToken = new Token(trimmed.toString(), t.startOffset(), 
t.endOffset(), t.type());
  +            cleanToken.setPositionIncrement(0);
  +        }
  +        return t;
  +        /*
           return new org.apache.lucene.analysis.Token
                   (trimmed.toString(), t.startOffset(), t.endOffset(), 
t.type());
  +        */
       }
   }
  
  
  
  Index: StandardAnalyzer.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/analyzer/StandardAnalyzer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StandardAnalyzer.java     19 Dec 2005 15:44:09 -0000      1.2
  +++ StandardAnalyzer.java     19 Dec 2005 16:16:46 -0000      1.3
  @@ -63,7 +63,7 @@
    * Filters [EMAIL PROTECTED] StandardTokenizer} with [EMAIL PROTECTED] 
StandardFilter}, [EMAIL PROTECTED]
    * LowerCaseFilter} and [EMAIL PROTECTED] StopFilter}.
    *
  - * @version $Id: StandardAnalyzer.java,v 1.2 2005/12/19 15:44:09 knguyen Exp 
$
  + * @version $Id: StandardAnalyzer.java,v 1.3 2005/12/19 16:16:46 knguyen Exp 
$
    */
   public class StandardAnalyzer extends Analyzer {
   
  @@ -113,11 +113,10 @@
           result = new StandardFilter(result);
           result = new LowerCaseFilter(result);
           result = new StopFilter(result, stopTable);
  -        /*
           result = new LanguageIndependantFilter(result);
           if (this.indexeAnalyzer) {
               result = new TokenWithQuoteFilter(result);
  -        }*/
  +        }
           return result;
       }
   }