Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 85230 invoked from network); 22 Feb 2011 21:19:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Feb 2011 21:19:44 -0000 Received: (qmail 19001 invoked by uid 500); 22 Feb 2011 21:19:43 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 18820 invoked by uid 500); 22 Feb 2011 21:19:43 -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 18813 invoked by uid 99); 22 Feb 2011 21:19:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Feb 2011 21:19:42 +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, 22 Feb 2011 21:19:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A43392388A66; Tue, 22 Feb 2011 21:19:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1073513 - in /commons/proper/codec/trunk/src: java/org/apache/commons/codec/language/ColognePhonetic.java test/org/apache/commons/codec/language/ColognePhoneticTest.java Date: Tue, 22 Feb 2011 21:19:19 -0000 To: commits@commons.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110222211919.A43392388A66@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Tue Feb 22 21:19:19 2011 New Revision: 1073513 URL: http://svn.apache.org/viewvc?rev=1073513&view=rev Log: Eberhard -> 01772 (not 0172) because two or more identical consecutive digits can occur if they occur after removing the "0" digits last step. Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java?rev=1073513&r1=1073512&r2=1073513&view=diff ============================================================================== --- commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java (original) +++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java Tue Feb 22 21:19:19 2011 @@ -165,7 +165,8 @@ import org.apache.commons.codec.StringEn * *
  • *

    Third step:

    - * Removal of all codes “0” except at the beginning + * Removal of all codes “0” except at the beginning. This means that two or more identical consecutive digits can occur + * if they occur after removing the "0" digits. * *

    Example:

    * {@code "6050750206802" => "65752682"}
    • @@ -368,10 +369,10 @@ public class ColognePhonetic implements if (code != '-' && (lastCode != code && (code != '0' || lastCode == '/') || code < '0' || code > '8')) { left.addRight(code); - lastCode = code; } lastChar = chr; + lastCode = code; } return left.toString(); } Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java?rev=1073513&r1=1073512&r2=1073513&view=diff ============================================================================== --- commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java (original) +++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java Tue Feb 22 21:19:19 2011 @@ -100,13 +100,13 @@ public class ColognePhoneticTest extends {"weber", "317"}, // {"wagner", "357"}, {"becker", "147"}, - {"hoffmann", "036"}, + {"hoffmann", "0366"}, {"sch\u00C4fer", "837"}, {"Breschnew", "17863"}, {"Wikipedia", "3412"}, {"peter", "127"}, {"pharma", "376"}, - {"mönchengladbach", "64645214"}, + {"mönchengladbach", "664645214"}, {"deutsch", "28"}, {"deutz", "28"}, {"hamburg", "06174"}, @@ -118,8 +118,8 @@ public class ColognePhoneticTest extends {"matsch", "68"}, {"matz", "68"}, {"Arbeitsamt", "071862"}, - {"Eberhard", "0172"}, - {"Eberhardt", "0172"}, + {"Eberhard", "01772"}, + {"Eberhardt", "01772"}, {"heithabu", "021"}}; this.checkEncodings(data); } @@ -147,8 +147,14 @@ public class ColognePhoneticTest extends } } - public void testVariations() { + public void testVariationsMeyer() { String data[] = {"Meier", "Maier", "Mair", "Meyer", "Meyr", "Mejer", "Major"}; this.checkEncodingVariations("67", data); + + } + + public void testVariationsMella() { + String data[] = {"mella", "milah", "moulla", "mellah", "muehle", "mule"}; + this.checkEncodingVariations("65", data); } }