Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C0014178B9 for ; Tue, 4 Nov 2014 19:50:32 +0000 (UTC) Received: (qmail 59160 invoked by uid 500); 4 Nov 2014 19:50:32 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 59084 invoked by uid 500); 4 Nov 2014 19:50:32 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 59074 invoked by uid 99); 4 Nov 2014 19:50:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2014 19:50:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2014 19:50:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A26782388A38; Tue, 4 Nov 2014 19:49:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1636703 - in /commons/proper/codec/trunk/src: main/java/org/apache/commons/codec/language/bm/ main/resources/org/apache/commons/codec/language/bm/ test/java/org/apache/commons/codec/language/bm/ Date: Tue, 04 Nov 2014 19:49:40 -0000 To: commits@commons.apache.org From: tn@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141104194940.A26782388A38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tn Date: Tue Nov 4 19:49:40 2014 New Revision: 1636703 URL: http://svn.apache.org/r1636703 Log: [CODEC-187] Update Beider-Morse rules to v3.4. Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java commons/proper/codec/trunk/src/main/resources/org/apache/commons/codec/language/bm/ash_approx_common.txt commons/proper/codec/trunk/src/main/resources/org/apache/commons/codec/language/bm/gen_approx_common.txt commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java?rev=1636703&r1=1636702&r2=1636703&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java Tue Nov 4 19:49:40 2014 @@ -65,7 +65,7 @@ import org.apache.commons.codec.StringEn * Down-stream applications may wish to further process the encoding for indexing or lookup purposes, for example, by * splitting on pipe (|) and indexing under each of these alternatives. *

- * Note: this version of the Beider-Morse encoding is equivalent with v3.3 of the reference implementation. + * Note: this version of the Beider-Morse encoding is equivalent with v3.4 of the reference implementation. * * @see Beider-Morse Phonetic Matching * @see Reference implementation Modified: commons/proper/codec/trunk/src/main/resources/org/apache/commons/codec/language/bm/ash_approx_common.txt URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/resources/org/apache/commons/codec/language/bm/ash_approx_common.txt?rev=1636703&r1=1636702&r2=1636703&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/resources/org/apache/commons/codec/language/bm/ash_approx_common.txt (original) +++ commons/proper/codec/trunk/src/main/resources/org/apache/commons/codec/language/bm/ash_approx_common.txt Tue Nov 4 19:49:40 2014 @@ -201,7 +201,13 @@ "lEndEr" "" "$" "lYnder" "lendEr" "" "$" "lYnder" "lEnder" "" "$" "lYnder" - + +// burg = berg +"bUrk" "" "$" "(burk|berk)" +"burk" "" "$" "(burk|berk)" +"bUrg" "" "$" "(burk|berk)" +"burg" "" "$" "(burk|berk)" + // CONSONANTS {z & Z; s & S} are approximately interchangeable "s" "" "[rmnl]" "z" "S" "" "[rmnl]" "z" Modified: commons/proper/codec/trunk/src/main/resources/org/apache/commons/codec/language/bm/gen_approx_common.txt URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/resources/org/apache/commons/codec/language/bm/gen_approx_common.txt?rev=1636703&r1=1636702&r2=1636703&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/resources/org/apache/commons/codec/language/bm/gen_approx_common.txt (original) +++ commons/proper/codec/trunk/src/main/resources/org/apache/commons/codec/language/bm/gen_approx_common.txt Tue Nov 4 19:49:40 2014 @@ -205,7 +205,17 @@ "lEndEr" "" "$" "lYnder" "lendEr" "" "$" "lYnder" "lEnder" "" "$" "lYnder" - + +// burg = berg +"burk" "" "$" "(burk|berk)" +"bUrk" "" "$" "(burk|berk)" +"burg" "" "$" "(burk|berk)" +"bUrg" "" "$" "(burk|berk)" +"Burk" "" "$" "(burk|berk)" +"BUrk" "" "$" "(burk|berk)" +"Burg" "" "$" "(burk|berk)" +"BUrg" "" "$" "(burk|berk)" + // CONSONANTS {z & Z; s & S} are approximately interchangeable "s" "" "[rmnl]" "z" "S" "" "[rmnl]" "z" Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java?rev=1636703&r1=1636702&r2=1636703&view=diff ============================================================================== --- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java (original) +++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/PhoneticEngineTest.java Tue Nov 4 19:49:40 2014 @@ -17,7 +17,8 @@ package org.apache.commons.codec.language.bm; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.List; @@ -50,7 +51,13 @@ public class PhoneticEngineTest { "(elSink|elsink|helSink|helsink|helzink|xelsink)-(banhelsink|fanhelsink|fanhelzink|vanhelsink|vanhelzink|vanjelsink)", NameType.GENERIC, RuleType.EXACT, - Boolean.FALSE, TEN }); + Boolean.FALSE, TEN }, + new Object[] { + "Judenburg", + "iudnbYrk|iudnbirk|iudnburk|xudnbirk|xudnburk|zudnbirk|zudnburk", + NameType.GENERIC, + RuleType.APPROX, + Boolean.TRUE, TEN }); } private final boolean concat;