You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/07/11 17:07:54 UTC
svn commit: r1609725 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/
lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/
Author: rmuir
Date: Fri Jul 11 15:07:53 2014
New Revision: 1609725
URL: http://svn.apache.org/r1609725
Log:
LUCENE-5817: Fix hunspell zero-affix handling
Added:
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestZeroAffix.java
- copied unchanged from r1609723, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestZeroAffix.java
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/zeroaffix.aff
- copied unchanged from r1609723, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/zeroaffix.aff
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/zeroaffix.dic
- copied unchanged from r1609723, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/zeroaffix.dic
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1609725&r1=1609724&r2=1609725&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Fri Jul 11 15:07:53 2014
@@ -69,6 +69,9 @@ Bug Fixes
incorrect results when grouping on fields with missing values.
(æµ·è澤 å¿ä¿¡, hossman)
+* LUCENE-5817: Fix hunspell zero-affix handling: previously only zero-strips worked
+ correctly. (Robert Muir)
+
Test Framework
* LUCENE-5786: Unflushed/ truncated events file (hung testing subprocess).
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java?rev=1609725&r1=1609724&r2=1609725&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java Fri Jul 11 15:07:53 2014
@@ -435,7 +435,7 @@ public class Dictionary {
char flag = flagParsingStrategy.parseFlag(ruleArgs[1]);
String strip = ruleArgs[2].equals("0") ? "" : ruleArgs[2];
- String affixArg = ruleArgs[3];
+ String affixArg = ruleArgs[3].equals("0") ? "" : ruleArgs[3];
char appendFlags[] = null;
int flagSep = affixArg.lastIndexOf('/');
@@ -452,8 +452,6 @@ public class Dictionary {
twoStageAffix = true;
}
- // TODO: add test and fix zero-affix handling!
-
String condition = ruleArgs.length > 4 ? ruleArgs[4] : ".";
// at least the gascon affix file has this issue
if (condition.startsWith("[") && condition.indexOf(']') == -1) {