You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2015/11/10 20:19:57 UTC
svn commit: r1713717 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/
lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/
Author: dweiss
Date: Tue Nov 10 19:19:57 2015
New Revision: 1713717
URL: http://svn.apache.org/viewvc?rev=1713717&view=rev
Log:
Reverting 1713712 (LUCENE-6875), wrong patch.
Removed:
lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationRegularFilter.java
lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationRegularFilter.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java
lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1713717&r1=1713716&r2=1713717&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Tue Nov 10 19:19:57 2015
@@ -13,9 +13,6 @@ New Features
input tokens. Useful for normalizing short text in clustering/linking
tasks. (Mark Harwood, Adrien Grand)
-* LUCENE-6875: New Serbian normalization filter. (Nikola Smolenski via
- Robert Muir, Dawid Weiss)
-
* LUCENE-6720: New FunctionRangeQuery wrapper around ValueSourceScorer
(returned from ValueSource/FunctionValues.getRangeScorer()). (David Smiley)
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java?rev=1713717&r1=1713716&r2=1713717&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java Tue Nov 10 19:19:57 2015
@@ -17,7 +17,6 @@ package org.apache.lucene.analysis.sr;
* limitations under the License.
*/
-import java.util.Arrays;
import java.util.Map;
import org.apache.lucene.analysis.TokenStream;
@@ -32,19 +31,15 @@ import org.apache.lucene.analysis.util.T
* <analyzer>
* <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.LowerCaseFilterFactory"/>
- * <filter class="solr.SerbianNormalizationFilterFactory"
- * haircut="bald"/>
+ * <filter class="solr.SerbianNormalizationFilterFactory"/>
* </analyzer>
* </fieldType></pre>
*/
public class SerbianNormalizationFilterFactory extends TokenFilterFactory implements MultiTermAwareComponent {
- final String haircut;
/** Creates a new SerbianNormalizationFilterFactory */
public SerbianNormalizationFilterFactory(Map<String,String> args) {
super(args);
-
- this.haircut = get(args, "haircut", Arrays.asList( "bald", "regular" ), "bald");
if (!args.isEmpty()) {
throw new IllegalArgumentException("Unknown parameters: " + args);
}
@@ -52,11 +47,7 @@ public class SerbianNormalizationFilterF
@Override
public TokenStream create(TokenStream input) {
- if( this.haircut.equals( "regular" ) ) {
- return new SerbianNormalizationRegularFilter(input);
- } else {
- return new SerbianNormalizationFilter(input);
- }
+ return new SerbianNormalizationFilter(input);
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java?rev=1713717&r1=1713716&r2=1713717&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java Tue Nov 10 19:19:57 2015
@@ -36,15 +36,7 @@ public class TestSerbianNormalizationFil
stream = tokenFilterFactory("SerbianNormalization").create(stream);
assertTokenStreamContents(stream, new String[] { "djura" });
}
-
- public void testRegularStemming() throws Exception {
- Reader reader = new StringReader("ÑÑÑа");
- TokenStream stream = new MockTokenizer(MockTokenizer.WHITESPACE, false);
- ((Tokenizer)stream).setReader(reader);
- stream = tokenFilterFactory("SerbianNormalization", "haircut", "regular").create(stream);
- assertTokenStreamContents(stream, new String[] { "Äura" });
- }
-
+
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
try {
@@ -54,5 +46,4 @@ public class TestSerbianNormalizationFil
assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
-
}