Skip to content

CODEC-281: Double metaphone encode kc as K #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sguill wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CODEC-281: Double metaphone encode kc as K #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
444f8d2
CODEC-281: encode kc as K
Feb 18, 2020
eb9ca3d
CODEC-281: add test on Kirkcaldy in DoubleMetaphone2Test
Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ public String doubleMetaphone(String value, final boolean alternate) {
index = handleJ(value, result, index, slavoGermanic);
break;
case 'K':
result.append('K');
index = charAt(value, index + 1) == 'K' ? index + 2 : index + 1;
index = handleK(value, result, index);
break;
case 'L':
index = handleL(value, result, index);
Expand Down Expand Up @@ -543,6 +542,25 @@ private int handleJ(final String value, final DoubleMetaphoneResult result, int
return index;
}

/**
* Handles 'K' cases.
*/
private int handleK(final String value, final DoubleMetaphoneResult result, int index) {
result.append('K');
if (charAt(value, index + 1) == 'K') {
index += 2;
} else if ((charAt(value, index + 1) == 'C')) { //-- in "Kirkcaldy", "kc" should be encoded "K" instead of "KK" --//
final DoubleMetaphoneResult nextCharResult = new DoubleMetaphoneResult(this.getMaxCodeLen());
int nextCharIndex = handleC(value, nextCharResult, index + 1);
if (nextCharResult.getPrimary().equals("K")) {
index = nextCharIndex;
}
} else {
index++;
}
return index;
}

/**
* Handles 'L' cases.
*/
Expand Down
1 change: 1 addition & 0 deletions src/test/java/org/apache/commons/codec/language/DoubleMetaphone2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,7 @@ public class DoubleMetaphone2Test extends StringEncoderAbstractTest<DoubleMetaph
{"King", "KNK", "KNK"},
{"Kinsey", "KNS", "KNS"},
{"Kirk", "KRK", "KRK"},
{"Kirkcaldy", "KRKL", "KRKL"},
{"Kirton", "KRTN", "KRTN"},
{"Kistler", "KSTL", "KSTL"},
{"Kitchen", "KXN", "KXN"},
Expand Down