You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ko...@apache.org on 2011/02/23 17:27:56 UTC
svn commit: r1073810 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/
solr/src/java/org/apache/solr/analysis/
Author: koji
Date: Wed Feb 23 16:27:55 2011
New Revision: 1073810
URL: http://svn.apache.org/viewvc?rev=1073810&view=rev
Log:
LUCENE-2894: add more contribution
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/CHANGES.txt
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java
Modified: lucene/dev/branches/branch_3x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/CHANGES.txt?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/CHANGES.txt Wed Feb 23 16:27:55 2011
@@ -706,7 +706,7 @@ Documentation
(Adriano Crestani via Robert Muir)
* LUCENE-2894: Use google-code-prettify for syntax highlighting in javadoc.
- (Koji Sekiguchi)
+ (Shinichiro Abe, Koji Sekiguchi)
================== Release 2.9.4 / 3.0.3 2010-12-03 ====================
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -20,7 +20,17 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.in.IndicNormalizationFilter;
-/** Factory for {@link IndicNormalizationFilter} */
+/**
+ * Factory for {@link IndicNormalizationFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_innormal" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.IndicNormalizationFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
+ */
public class IndicNormalizationFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
return new IndicNormalizationFilter(input);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -22,7 +22,17 @@ import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.id.IndonesianStemFilter;
-/** Factory for {@link IndonesianStemFilter} */
+/**
+ * Factory for {@link IndonesianStemFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_idstem" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.IndonesianStemFilterFactory" stemDerivational="true"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
+ */
public class IndonesianStemFilterFactory extends BaseTokenFilterFactory {
private boolean stemDerivational = true;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -20,7 +20,17 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.it.ItalianLightStemFilter;
-/** Factory for {@link ItalianLightStemFilter} */
+/**
+ * Factory for {@link ItalianLightStemFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_itlgtstem" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.ItalianLightStemFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
+ */
public class ItalianLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
return new ItalianLightStemFilter(input);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -29,6 +29,14 @@ import java.util.Set;
import java.io.IOException;
/**
+ * Factory for {@link KeepWordFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_keepword" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.KeepWordFilterFactory" words="keepwords.txt" ignoreCase="false" enablePositionIncrements="false"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id$
*/
public class KeepWordFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -26,7 +26,15 @@ import org.apache.solr.util.plugin.Resou
*/
/**
- * Factory for {@link KeywordMarkerFilter}
+ * Factory for {@link KeywordMarkerFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_keyword" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.KeywordMarkerFilterFactory" protected="protectedkeyword.txt" ignoreCase="false"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
*/
public class KeywordMarkerFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
public static final String PROTECTED_TOKENS = "protected";
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java Wed Feb 23 16:27:55 2011
@@ -22,6 +22,13 @@ import org.apache.lucene.analysis.Keywor
import java.io.Reader;
/**
+ * Factory for {@link KeywordTokenizer}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_keyword" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.KeywordTokenizerFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id: LowerCaseTokenizerFactory.java 382610 2006-03-03 01:43:03Z yonik $
*/
public class KeywordTokenizerFactory extends BaseTokenizerFactory {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -23,6 +23,14 @@ import org.apache.lucene.analysis.Length
import java.util.Map;
/**
+ * Factory for {@link LengthFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_lngth" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.LengthFilterFactory" min="0" max="1" enablePositionIncrements="false"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id$
*/
public class LengthFilterFactory extends BaseTokenFilterFactory {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java Wed Feb 23 16:27:55 2011
@@ -23,6 +23,13 @@ import java.io.Reader;
import java.util.Map;
/**
+ * Factory for {@link LetterTokenizer}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_letter" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.LetterTokenizerFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id$
*/
public class LetterTokenizerFactory extends BaseTokenizerFactory {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -22,6 +22,17 @@ import java.util.Map;
import org.apache.lucene.analysis.LimitTokenCountFilter;
import org.apache.lucene.analysis.TokenStream;
+/**
+ * Factory for {@link LimitTokenCountFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_lngthcnt" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="10"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
+ */
public class LimitTokenCountFilterFactory extends BaseTokenFilterFactory {
int maxTokenCount;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -23,6 +23,14 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.LowerCaseFilter;
/**
+ * Factory for {@link LowerCaseFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_lwrcase" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id$
*/
public class LowerCaseFilterFactory extends BaseTokenFilterFactory {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java Wed Feb 23 16:27:55 2011
@@ -23,6 +23,13 @@ import java.io.Reader;
import java.util.Map;
/**
+ * Factory for {@link LowerCaseTokenizer}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_lwrcase" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.LowerCaseTokenizerFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id$
*/
public class LowerCaseTokenizerFactory extends BaseTokenizerFactory {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -32,6 +32,14 @@ import org.apache.solr.common.util.StrUt
import org.apache.solr.util.plugin.ResourceLoaderAware;
/**
+ * Factory for {@link MappingCharFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_map" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <charFilter class="solr.MappingCharFilterFactory" mapping="mapping.txt"/>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
*
* @version $Id$
* @since Solr 1.4
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -22,7 +22,15 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.ngram.NGramTokenFilter;
/**
- * Creates new instances of {@link NGramTokenFilter}.
+ * Factory for {@link NGramTokenFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_ngrm" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.NGramFilterFactory" minGramSize="1" maxGramSize="2"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
*/
public class NGramFilterFactory extends BaseTokenFilterFactory {
private int maxGramSize = 0;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java Wed Feb 23 16:27:55 2011
@@ -24,7 +24,14 @@ import java.io.Reader;
import java.util.Map;
/**
- * Creates new instances of {@link NGramTokenizer}.
+ * Factory for {@link NGramTokenizer}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_ngrm" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.NGramTokenizerFactory" minGramSize="1" maxGramSize="2"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
*/
public class NGramTokenizerFactory extends BaseTokenizerFactory {
private int maxGramSize = 0;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java?rev=1073810&r1=1073809&r2=1073810&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java Wed Feb 23 16:27:55 2011
@@ -23,7 +23,17 @@ import org.apache.lucene.analysis.payloa
import org.apache.lucene.analysis.TokenStream;
import java.util.Map;
-/** Factory for {@link NumericPayloadTokenFilter} */
+/**
+ * Factory for {@link NumericPayloadTokenFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_numpayload" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.NumericPayloadTokenFilterFactory" payload="24" typeMatch="word"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
+ */
public class NumericPayloadTokenFilterFactory extends BaseTokenFilterFactory {
private float payload;
private String typeMatch;