From java-commits-fgray@example.com Tue Dec 01 08:44:23 2009 Return-Path: <java-commits-fgray@example.com> Delivered-To: fgray@example.com Received: (qmail 13652 invoked from network); 1 Dec 2009 08:44:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2009 08:44:23 -0000 Received: (qmail 56252 invoked by uid 500); 1 Dec 2009 08:44:23 -0000 Delivered-To: fgray@example.com Received: (qmail 56173 invoked by uid 500); 1 Dec 2009 08:44:22 -0000 Mailing-List: contact fgray@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:fgray@example.com> List-Unsubscribe: <mailto:fgray@example.com> List-Post: <mailto:fgray@example.com> List-Id: <java-commits.lucene.apache.org> Reply-To: fgray@example.com Delivered-To: mailing list fgray@example.com Received: (qmail 56164 invoked by uid 99); 1 Dec 2009 08:44:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 08:44:22 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eos.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 08:44:19 +0000 Received: from eos.apache.org (localhost [83.161.120.155]) by eos.apache.org (Postfix) with ESMTP id 8FDAC16E2B; Tue, 1 Dec 2009 08:43:59 +0000 (GMT) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Apache Wiki <fgray@example.com> To: Apache Wiki <fgray@example.com> Date: Tue, 01 Dec 2009 08:43:59 -0000 Message-ID: <fgray@example.com> Subject: =?utf-8?q?=5BLucene-java_Wiki=5D_Update_of_=22PoweredBy=22_by_HanspeterKl?= =?utf-8?q?apf?= Dear Wiki user, You have subscribed to a wiki page or wiki category on "Lucene-java Wiki" f= or change notification. The "PoweredBy" page has been changed by HanspeterKlapf. http://wiki.apache.org/lucene-java/PoweredBy?action=3Ddiff&rev1=3D406&rev2= =3D407 -------------------------------------------------- * [[http://www.osua.de/|OSUA GmbH]] * [[http://www.pangaea.de/|PANGAEA]] - Publishing Network for Geoscienti= fic & Environmental Data * [[http://www.planta.de/|PLANTA GmbH]] + * [[http://portal.linz.gv.at/Serviceguide/search.html|portal.linz.gv.at = - Stadt Linz B=C3=BCrgerservice]] * [[http://quotle.com/|quotle.com]] - a quote search engine * [[http://www.searchmorph.com/|SearchMorph - indexes javadoc of OSS jav= a projects]] * [[http://www.service.tas.gov.au/|Service Tasmania Online]] - index of = Government services for Tasmania, Australia. From java-commits-fgray@example.com Tue Dec 01 11:38:55 2009 Return-Path: <java-commits-fgray@example.com> Delivered-To: fgray@example.com Received: (qmail 82015 invoked from network); 1 Dec 2009 11:38:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2009 11:38:55 -0000 Received: (qmail 99153 invoked by uid 500); 1 Dec 2009 11:38:55 -0000 Delivered-To: fgray@example.com Received: (qmail 99070 invoked by uid 500); 1 Dec 2009 11:38:54 -0000 Mailing-List: contact fgray@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:fgray@example.com> List-Unsubscribe: <mailto:fgray@example.com> List-Post: <mailto:fgray@example.com> List-Id: <java-commits.lucene.apache.org> Reply-To: fgray@example.com Delivered-To: mailing list fgray@example.com Received: (qmail 99060 invoked by uid 99); 1 Dec 2009 11:38:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 11:38:54 +0000 X-ASF-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 11:38:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7A5CF23888C5; Tue, 1 Dec 2009 11:38:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r885740 - in /lucene/java/trunk/src/java/org/apache/lucene/search: TopDocs.java TopFieldDocs.java Date: Tue, 01 Dec 2009 11:38:32 -0000 To: fgray@example.com From: fgray@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <fgray@example.com> Author: mikemccand Date: Tue Dec 1 11:38:31 2009 New Revision: 885740 URL: http://svn.apache.org/viewvc?rev=885740&view=rev Log: remove expert & low-level characterization for TopDocs/TopFieldDocs Modified: lucene/java/trunk/src/java/org/apache/lucene/search/TopDocs.java lucene/java/trunk/src/java/org/apache/lucene/search/TopFieldDocs.java Modified: lucene/java/trunk/src/java/org/apache/lucene/search/TopDocs.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/TopDocs.java?rev=885740&r1=885739&r2=885740&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/search/TopDocs.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/search/TopDocs.java Tue Dec 1 11:38:31 2009 @@ -17,36 +17,36 @@ * limitations under the License. */ -/** Expert: Returned by low-level search implementations. - * @see Searcher#search(Query,Filter,int) */ +/** Represents hits returned by {@link + * Searcher#search(Query,Filter,int)} and {@link + * Searcher#search(Query,int)}. */ public class TopDocs implements java.io.Serializable { - /** Expert: The total number of hits for the query. + /** The total number of hits for the query. */ public int totalHits; - /** Expert: The top hits for the query. */ + /** The top hits for the query. */ public ScoreDoc[] scoreDocs; - /** Expert: Stores the maximum score value encountered, needed for normalizing. */ + /** Stores the maximum score value encountered, needed for normalizing. */ private float maxScore; /** - * Expert: Returns the maximum score value encountered. Note that in case + * Returns the maximum score value encountered. Note that in case * scores are not tracked, this returns {@link Float#NaN}. */ public float getMaxScore() { return maxScore; } - /** Expert: Sets the maximum score value encountered. */ + /** Sets the maximum score value encountered. */ public void setMaxScore(float maxScore) { this.maxScore=maxScore; } - /** Expert: Constructs a TopDocs with a default maxScore=Float.NaN. */ + /** Constructs a TopDocs with a default maxScore=Float.NaN. */ TopDocs(int totalHits, ScoreDoc[] scoreDocs) { this(totalHits, scoreDocs, Float.NaN); } - /** Expert: Constructs a TopDocs.*/ public TopDocs(int totalHits, ScoreDoc[] scoreDocs, float maxScore) { this.totalHits = totalHits; this.scoreDocs = scoreDocs; Modified: lucene/java/trunk/src/java/org/apache/lucene/search/TopFieldDocs.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/TopFieldDocs.java?rev=885740&r1=885739&r2=885740&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/search/TopFieldDocs.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/search/TopFieldDocs.java Tue Dec 1 11:38:31 2009 @@ -18,13 +18,8 @@ */ -/** - * Expert: Returned by low-level sorted search implementations. - * - * <p>Created: Feb 12, 2004 8:58:46 AM - * - * @since lucene 1.4 - * @see Searcher#search(Query,Filter,int,Sort) +/** Represents hits returned by {@link + * Searcher#search(Query,Filter,int,Sort)}. */ public class TopFieldDocs extends TopDocs { From java-commits-fgray@example.com Tue Dec 01 11:40:21 2009 Return-Path: <java-commits-fgray@example.com> Delivered-To: fgray@example.com Received: (qmail 82531 invoked from network); 1 Dec 2009 11:40:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2009 11:40:21 -0000 Received: (qmail 8224 invoked by uid 500); 1 Dec 2009 11:40:21 -0000 Delivered-To: fgray@example.com Received: (qmail 8184 invoked by uid 500); 1 Dec 2009 11:40:21 -0000 Mailing-List: contact fgray@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:fgray@example.com> List-Unsubscribe: <mailto:fgray@example.com> List-Post: <mailto:fgray@example.com> List-Id: <java-commits.lucene.apache.org> Reply-To: fgray@example.com Delivered-To: mailing list fgray@example.com Received: (qmail 8154 invoked by uid 99); 1 Dec 2009 11:40:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 11:40:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 11:40:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4A2CB23888C5; Tue, 1 Dec 2009 11:39:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r885741 - in /lucene/java/branches/lucene_3_0: ./ contrib/ contrib/highlighter/src/test/ src/java/org/apache/lucene/search/ src/test/org/apache/lucene/analysis/ src/test/org/apache/lucene/document/ src/test/org/apache/lucene/index/ src/test... Date: Tue, 01 Dec 2009 11:39:56 -0000 To: fgray@example.com From: fgray@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <fgray@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Tue Dec 1 11:39:55 2009 New Revision: 885741 URL: http://svn.apache.org/viewvc?rev=885741&view=rev Log: (on 3.0 branch) remove expert & low-level characterization for TopDocs/TopFieldDocs Modified: lucene/java/branches/lucene_3_0/ (props changed) lucene/java/branches/lucene_3_0/CHANGES.txt (props changed) lucene/java/branches/lucene_3_0/contrib/ (props changed) lucene/java/branches/lucene_3_0/contrib/CHANGES.txt (props changed) lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/ (props changed) lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (props changed) lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/TopDocs.java lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/TopFieldDocs.java lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java (props changed) lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java (props changed) lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java (props changed) lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed) lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java (props changed) Propchange: lucene/java/branches/lucene_3_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,4 +1,4 @@ /lucene/java/branches/lucene_2_4:748824 /lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036 /lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336 -/lucene/java/trunk:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554 +/lucene/java/trunk:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870 Propchange: lucene/java/branches/lucene_3_0/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,4 +1,4 @@ /lucene/java/branches/lucene_2_4/CHANGES.txt:748824 /lucene/java/branches/lucene_2_9/CHANGES.txt:817269-818600,825998,829134,829881,831036 /lucene/java/branches/lucene_2_9_back_compat_tests/CHANGES.txt:818601-821336 -/lucene/java/trunk/CHANGES.txt:881213,881315,881466,882374,882464,882672,882807,882888,882977,883074-883075,883554,883654,883661 +/lucene/java/trunk/CHANGES.txt:881213,881315,881466,882374,882464,882672,882807,882888,882977,883074-883075,883554,883654,883661,884870 Propchange: lucene/java/branches/lucene_3_0/contrib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,4 +1,4 @@ /lucene/java/branches/lucene_2_4/contrib:748824 /lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036 /lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-821336 -/lucene/java/trunk/contrib:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554 +/lucene/java/trunk/contrib:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870 Propchange: lucene/java/branches/lucene_3_0/contrib/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,4 +1,4 @@ /lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824 /lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036 /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/CHANGES.txt:818601-821336 -/lucene/java/trunk/contrib/CHANGES.txt:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554 +/lucene/java/trunk/contrib/CHANGES.txt:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870 Propchange: lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,4 +1,4 @@ /lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824 /lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036 /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/highlighter/src/test:818601-821336 -/lucene/java/trunk/contrib/highlighter/src/test:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554 +/lucene/java/trunk/contrib/highlighter/src/test:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870 Propchange: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,4 +1,4 @@ /lucene/java/branches/lucene_2_4/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:748824 /lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:817269-818600,825998,829134,829881,831036 /lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:818601-821336 -/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:881213,881315,881466,881984,882374,882672,882807,882888,882977,883074-883075,883554 +/lucene/java/trunk/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java:881213,881315,881466,881984,882374,882672,882807,882888,882977,883074-883075,883554,884870 Modified: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/TopDocs.java URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/TopDocs.java?rev=885741&r1=885740&r2=885741&view=diff ============================================================================== --- lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/TopDocs.java (original) +++ lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/TopDocs.java Tue Dec 1 11:39:55 2009 @@ -17,36 +17,36 @@ * limitations under the License. */ -/** Expert: Returned by low-level search implementations. - * @see Searcher#search(Query,Filter,int) */ +/** Represents hits returned by {@link + * Searcher#search(Query,Filter,int)} and {@link + * Searcher#search(Query,int)}. */ public class TopDocs implements java.io.Serializable { - /** Expert: The total number of hits for the query. + /** The total number of hits for the query. */ public int totalHits; - /** Expert: The top hits for the query. */ + /** The top hits for the query. */ public ScoreDoc[] scoreDocs; - /** Expert: Stores the maximum score value encountered, needed for normalizing. */ + /** Stores the maximum score value encountered, needed for normalizing. */ private float maxScore; /** - * Expert: Returns the maximum score value encountered. Note that in case + * Returns the maximum score value encountered. Note that in case * scores are not tracked, this returns {@link Float#NaN}. */ public float getMaxScore() { return maxScore; } - /** Expert: Sets the maximum score value encountered. */ + /** Sets the maximum score value encountered. */ public void setMaxScore(float maxScore) { this.maxScore=maxScore; } - /** Expert: Constructs a TopDocs with a default maxScore=Float.NaN. */ + /** Constructs a TopDocs with a default maxScore=Float.NaN. */ TopDocs(int totalHits, ScoreDoc[] scoreDocs) { this(totalHits, scoreDocs, Float.NaN); } - /** Expert: Constructs a TopDocs.*/ public TopDocs(int totalHits, ScoreDoc[] scoreDocs, float maxScore) { this.totalHits = totalHits; this.scoreDocs = scoreDocs; Modified: lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/TopFieldDocs.java URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/TopFieldDocs.java?rev=885741&r1=885740&r2=885741&view=diff ============================================================================== --- lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/TopFieldDocs.java (original) +++ lucene/java/branches/lucene_3_0/src/java/org/apache/lucene/search/TopFieldDocs.java Tue Dec 1 11:39:55 2009 @@ -18,13 +18,8 @@ */ -/** - * Expert: Returned by low-level sorted search implementations. - * - * <p>Created: Feb 12, 2004 8:58:46 AM - * - * @since lucene 1.4 - * @see Searcher#search(Query,Filter,int,Sort) +/** Represents hits returned by {@link + * Searcher#search(Query,Filter,int,Sort)}. */ public class TopFieldDocs extends TopDocs { Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,3 +1,3 @@ /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036 -/lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554 +/lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870 Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,3 +1,3 @@ /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036 -/lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554 +/lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870 Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,3 +1,3 @@ /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036 -/lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554 +/lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870 Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,3 +1,3 @@ /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036 -/lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554 +/lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870 Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/util/TestAttributeSource.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:39:55 2009 @@ -1,4 +1,4 @@ /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/util/TestAttributeSource.java:748824 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/util/TestAttributeSource.java:817269-818600,825998,829134,829881,831036 /lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/util/TestAttributeSource.java:818601-821336 -/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883079,883554 +/lucene/java/trunk/src/test/org/apache/lucene/util/TestAttributeSource.java:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883079,883554,884870 From java-commits-fgray@example.com Tue Dec 01 11:43:01 2009 Return-Path: <java-commits-fgray@example.com> Delivered-To: fgray@example.com Received: (qmail 83495 invoked from network); 1 Dec 2009 11:43:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2009 11:43:01 -0000 Received: (qmail 15788 invoked by uid 500); 1 Dec 2009 11:43:00 -0000 Delivered-To: fgray@example.com Received: (qmail 15719 invoked by uid 500); 1 Dec 2009 11:43:00 -0000 Mailing-List: contact fgray@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:fgray@example.com> List-Unsubscribe: <mailto:fgray@example.com> List-Post: <mailto:fgray@example.com> List-Id: <java-commits.lucene.apache.org> Reply-To: fgray@example.com Delivered-To: mailing list fgray@example.com Received: (qmail 15710 invoked by uid 99); 1 Dec 2009 11:43:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 11:43:00 +0000 X-ASF-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 11:42:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A70C323888C5; Tue, 1 Dec 2009 11:42:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r885744 - in /lucene/java/branches/lucene_2_9: ./ src/java/org/apache/lucene/search/TopDocs.java src/java/org/apache/lucene/search/TopFieldDocs.java src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java Date: Tue, 01 Dec 2009 11:42:37 -0000 To: fgray@example.com From: fgray@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <fgray@example.com> Author: mikemccand Date: Tue Dec 1 11:42:36 2009 New Revision: 885744 URL: http://svn.apache.org/viewvc?rev=885744&view=rev Log: (on 2.9 branch) remove expert & low-level characterization for TopDocs/TopFieldDocs Modified: lucene/java/branches/lucene_2_9/ (props changed) lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/TopDocs.java lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/TopFieldDocs.java lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (props changed) Propchange: lucene/java/branches/lucene_2_9/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:42:36 2009 @@ -1,2 +1,2 @@ /lucene/java/branches/lucene_2_4:748824 -/lucene/java/trunk:824125,826029,826385,830871,833095,833297,833886,882672,883554 +/lucene/java/trunk:824125,826029,826385,830871,833095,833297,833886,882672,883554,884870 Modified: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/TopDocs.java URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/TopDocs.java?rev=885744&r1=885743&r2=885744&view=diff ============================================================================== --- lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/TopDocs.java (original) +++ lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/TopDocs.java Tue Dec 1 11:42:36 2009 @@ -17,37 +17,35 @@ * limitations under the License. */ -/** Expert: Returned by low-level search implementations. - * @see Searcher#search(Query,Filter,int) */ +/** Represents hits returned by {@link + * Searcher#search(Query,Filter,int)} and {@link + * Searcher#search(Query,int)}. */ public class TopDocs implements java.io.Serializable { - /** Expert: The total number of hits for the query. - * @see Hits#length() - */ + /** The total number of hits for the query. */ public int totalHits; - /** Expert: The top hits for the query. */ + /** The top hits for the query. */ public ScoreDoc[] scoreDocs; - /** Expert: Stores the maximum score value encountered, needed for normalizing. */ + /** Stores the maximum score value encountered, needed for normalizing. */ private float maxScore; /** - * Expert: Returns the maximum score value encountered. Note that in case + * Returns the maximum score value encountered. Note that in case * scores are not tracked, this returns {@link Float#NaN}. */ public float getMaxScore() { return maxScore; } - /** Expert: Sets the maximum score value encountered. */ + /** Sets the maximum score value encountered. */ public void setMaxScore(float maxScore) { this.maxScore=maxScore; } - /** Expert: Constructs a TopDocs with a default maxScore=Float.NaN. */ + /** Constructs a TopDocs with a default maxScore=Float.NaN. */ TopDocs(int totalHits, ScoreDoc[] scoreDocs) { this(totalHits, scoreDocs, Float.NaN); } - /** Expert: Constructs a TopDocs.*/ public TopDocs(int totalHits, ScoreDoc[] scoreDocs, float maxScore) { this.totalHits = totalHits; this.scoreDocs = scoreDocs; Modified: lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/TopFieldDocs.java URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/TopFieldDocs.java?rev=885744&r1=885743&r2=885744&view=diff ============================================================================== --- lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/TopFieldDocs.java (original) +++ lucene/java/branches/lucene_2_9/src/java/org/apache/lucene/search/TopFieldDocs.java Tue Dec 1 11:42:36 2009 @@ -18,14 +18,8 @@ */ -/** - * Expert: Returned by low-level sorted search implementations. - * - * <p>Created: Feb 12, 2004 8:58:46 AM - * - * @since lucene 1.4 - * @version $Id$ - * @see Searcher#search(Query,Filter,int,Sort) +/** Represents hits returned by {@link + * Searcher#search(Query,Filter,int,Sort)}. */ public class TopFieldDocs extends TopDocs { Propchange: lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 1 11:42:36 2009 @@ -1,2 +1,2 @@ /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:748824 -/lucene/java/trunk/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:818920,824125,826029,826385,830871,833095,833297,833886,882672,883554 +/lucene/java/trunk/src/test/org/apache/lucene/analysis/BaseTokenStreamTestCase.java:818920,824125,826029,826385,830871,833095,833297,833886,882672,883554,884870 From java-commits-fgray@example.com Tue Dec 01 14:33:23 2009 Return-Path: <java-commits-fgray@example.com> Delivered-To: fgray@example.com Received: (qmail 54675 invoked from network); 1 Dec 2009 14:33:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Dec 2009 14:33:23 -0000 Received: (qmail 61537 invoked by uid 500); 1 Dec 2009 14:33:22 -0000 Delivered-To: fgray@example.com Received: (qmail 61467 invoked by uid 500); 1 Dec 2009 14:33:22 -0000 Mailing-List: contact fgray@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:fgray@example.com> List-Unsubscribe: <mailto:fgray@example.com> List-Post: <mailto:fgray@example.com> List-Id: <java-commits.lucene.apache.org> Reply-To: fgray@example.com Delivered-To: mailing list fgray@example.com Received: (qmail 61458 invoked by uid 99); 1 Dec 2009 14:33:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 14:33:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 14:33:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4D13E23888E9; Tue, 1 Dec 2009 14:32:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r885769 - /lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java Date: Tue, 01 Dec 2009 14:32:59 -0000 To: fgray@example.com From: fgray@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <fgray@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: uschindler Date: Tue Dec 1 14:32:58 2009 New Revision: 885769 URL: http://svn.apache.org/viewvc?rev=885769&view=rev Log: LUCENE-2094: Fix hudson build failure. Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java Modified: lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=885769&r1=885768&r2=885769&view=diff ============================================================================== --- lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java (original) +++ lucene/java/trunk/src/test/org/apache/lucene/search/TestPositionIncrement.java Tue Dec 1 14:32:58 2009 @@ -277,11 +277,7 @@ //System.out.println(pspans.doc() + " - " + pspans.start() + " - "+ pspans.end()); Collection<byte[]> payloads = pspans.getPayload(); sawZero |= pspans.start() == 0; - for (@SuppressWarnings("unused") byte[] bytes : payloads) { - count++; - //System.out.println(new String(bytes)); - - } + count += payloads.size(); } assertEquals(5, count); assertTrue(sawZero); From java-commits-fgray@example.com Wed Dec 02 10:21:56 2009 Return-Path: <java-commits-fgray@example.com> Delivered-To: fgray@example.com Received: (qmail 69408 invoked from network); 2 Dec 2009 10:21:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Dec 2009 10:21:56 -0000 Received: (qmail 89619 invoked by uid 500); 2 Dec 2009 10:21:55 -0000 Delivered-To: fgray@example.com Received: (qmail 89529 invoked by uid 500); 2 Dec 2009 10:21:55 -0000 Mailing-List: contact fgray@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:fgray@example.com> List-Unsubscribe: <mailto:fgray@example.com> List-Post: <mailto:fgray@example.com> List-Id: <java-commits.lucene.apache.org> Reply-To: fgray@example.com Delivered-To: mailing list fgray@example.com Received: (qmail 89520 invoked by uid 99); 2 Dec 2009 10:21:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 10:21:54 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eos.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 10:21:51 +0000 Received: from eos.apache.org (localhost [83.161.120.155]) by eos.apache.org (Postfix) with ESMTP id DDE381761F; Wed, 2 Dec 2009 10:21:30 +0000 (GMT) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Apache Wiki <fgray@example.com> To: Apache Wiki <fgray@example.com> Date: Wed, 02 Dec 2009 10:21:30 -0000 Message-ID: <fgray@example.com> Subject: =?utf-8?q?=5BLucene-java_Wiki=5D_Update_of_=22LuceneFAQ=22_by_ChasEmerick?= Dear Wiki user, You have subscribed to a wiki page or wiki category on "Lucene-java Wiki" f= or change notification. The "LuceneFAQ" page has been changed by ChasEmerick. The comment on this change is: added link to PDFTextStream library for inde= xing PDF documents, reordered such libraries so native-Java libs are listed= first. http://wiki.apache.org/lucene-java/LuceneFAQ?action=3Ddiff&rev1=3D140&rev2= =3D141 -------------------------------------------------- = [[http://pdfbox.org/|PDFBox]] is a Java API from Ben Litchfield that will= let you access the contents of a PDF document. It comes with integration c= lasses for Lucene to translate a PDF into a Lucene document. = + [[http://www.jpedal.org/|JPedal]] is a Java API for extracting text and i= mages from PDF documents. + = + [[http://snowtide.com/|PDFTextStream]] is a Java API for extracting text,= metadata, and form data from PDF documents. It also comes with an [[http:= //snowtide.com/easy_lucene_integration|integration module]] making it easie= r to convert a PDF document into a Lucene document. + = [[http://www.foolabs.com/xpdf/|XPDF]] is an open source tool that is lic= ensed under the GPL. It's not a Java tool, but there is a utility called pd= ftotext that can translate PDF files into text files on most platforms from= the command line. = Based on xpdf, there is a utility called [[http://pdftohtml.sourceforge.n= et/|pdftohtml]] that can translate PDF files into HTML files. This is also = not a Java application. - = - [[http://www.jpedal.org/|JPedal]] is a Java API for extracting text and i= mages from PDF documents. = = =3D=3D=3D=3D How can I index JSP files? =3D=3D=3D=3D From java-commits-fgray@example.com Wed Dec 02 15:52:06 2009 Return-Path: <java-commits-fgray@example.com> Delivered-To: fgray@example.com Received: (qmail 78260 invoked from network); 2 Dec 2009 15:52:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Dec 2009 15:52:06 -0000 Received: (qmail 36241 invoked by uid 500); 2 Dec 2009 15:52:06 -0000 Delivered-To: fgray@example.com Received: (qmail 36179 invoked by uid 500); 2 Dec 2009 15:52:05 -0000 Mailing-List: contact fgray@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:fgray@example.com> List-Unsubscribe: <mailto:fgray@example.com> List-Post: <mailto:fgray@example.com> List-Id: <java-commits.lucene.apache.org> Reply-To: fgray@example.com Delivered-To: mailing list fgray@example.com Received: (qmail 36170 invoked by uid 99); 2 Dec 2009 15:52:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 15:52:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 15:52:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 912DF23888C5; Wed, 2 Dec 2009 15:51:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r886184 - in /lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search: TestNumericRangeQuery32.java TestWildcard.java Date: Wed, 02 Dec 2009 15:51:41 -0000 To: fgray@example.com From: fgray@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <fgray@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: markrmiller Date: Wed Dec 2 15:51:41 2009 New Revision: 886184 URL: http://svn.apache.org/viewvc?rev=886184&view=rev Log: update back compat tests for trunk merge Modified: lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestWildcard.java Modified: lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=886184&r1=886183&r2=886184&view=diff ============================================================================== --- lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original) +++ lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Wed Dec 2 15:51:41 2009 @@ -438,37 +438,39 @@ assertFalse(q2.equals(q1)); } - private void testEnum(int lower, int upper) throws Exception { - NumericRangeQuery<Integer> q = NumericRangeQuery.newIntRange("field4", 4, lower, upper, true, true); - FilteredTermEnum termEnum = q.getEnum(searcher.getIndexReader()); - try { - int count = 0; - do { - final Term t = termEnum.term(); - if (t != null) { - final int val = NumericUtils.prefixCodedToInt(t.text()); - assertTrue("value not in bounds", val >= lower && val <= upper); - count++; - } else break; - } while (termEnum.next()); - assertFalse(termEnum.next()); - System.out.println("TermEnum on 'field4' for range [" + lower + "," + upper + "] contained " + count + " terms."); - } finally { - termEnum.close(); - } - } +// Removed for now - NumericRangeQuery does not currently implement getEnum - public void testEnum() throws Exception { - int count=3000; - int lower=(distance*3/2)+startOffset, upper=lower + count*distance + (distance/3); - // test enum with values - testEnum(lower, upper); - // test empty enum - testEnum(upper, lower); - // test empty enum outside of bounds - lower = distance*noDocs+startOffset; - upper = 2 * lower; - testEnum(lower, upper); - } +// private void testEnum(int lower, int upper) throws Exception { +// NumericRangeQuery<Integer> q = NumericRangeQuery.newIntRange("field4", 4, lower, upper, true, true); +// FilteredTermEnum termEnum = q.getEnum(searcher.getIndexReader()); +// try { +// int count = 0; +// do { +// final Term t = termEnum.term(); +// if (t != null) { +// final int val = NumericUtils.prefixCodedToInt(t.text()); +// assertTrue("value not in bounds", val >= lower && val <= upper); +// count++; +// } else break; +// } while (termEnum.next()); +// assertFalse(termEnum.next()); +// System.out.println("TermEnum on 'field4' for range [" + lower + "," + upper + "] contained " + count + " terms."); +// } finally { +// termEnum.close(); +// } +// } +// +// public void testEnum() throws Exception { +// int count=3000; +// int lower=(distance*3/2)+startOffset, upper=lower + count*distance + (distance/3); +// // test enum with values +// testEnum(lower, upper); +// // test empty enum +// testEnum(upper, lower); +// // test empty enum outside of bounds +// lower = distance*noDocs+startOffset; +// upper = 2 * lower; +// testEnum(lower, upper); +// } } Modified: lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestWildcard.java URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestWildcard.java?rev=886184&r1=886183&r2=886184&view=diff ============================================================================== --- lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestWildcard.java (original) +++ lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/search/TestWildcard.java Wed Dec 2 15:51:41 2009 @@ -104,8 +104,9 @@ MultiTermQuery wq = new WildcardQuery(new Term("field", "")); wq.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_QUERY_REWRITE); assertMatches(searcher, wq, 0); - BooleanQuery expected = new BooleanQuery(); - assertEquals(searcher.rewrite(expected), searcher.rewrite(wq)); + Query q = searcher.rewrite(wq); + assertTrue(q instanceof BooleanQuery); + assertEquals(0, ((BooleanQuery) q).clauses().size()); } /** From java-commits-fgray@example.com Wed Dec 02 15:56:05 2009 Return-Path: <java-commits-fgray@example.com> Delivered-To: fgray@example.com Received: (qmail 79375 invoked from network); 2 Dec 2009 15:56:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Dec 2009 15:56:05 -0000 Received: (qmail 42791 invoked by uid 500); 2 Dec 2009 15:56:05 -0000 Delivered-To: fgray@example.com Received: (qmail 42715 invoked by uid 500); 2 Dec 2009 15:56:05 -0000 Mailing-List: contact fgray@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:fgray@example.com> List-Unsubscribe: <mailto:fgray@example.com> List-Post: <mailto:fgray@example.com> List-Id: <java-commits.lucene.apache.org> Reply-To: fgray@example.com Delivered-To: mailing list fgray@example.com Received: (qmail 42672 invoked by uid 99); 2 Dec 2009 15:56:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 15:56:05 +0000 X-ASF-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 15:56:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F3C6523888D1; Wed, 2 Dec 2009 15:55:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r886187 - /lucene/java/tags/flex_1458_3_0_back_compat_tests_20091202/ Date: Wed, 02 Dec 2009 15:55:42 -0000 To: fgray@example.com From: fgray@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <fgray@example.com> Author: markrmiller Date: Wed Dec 2 15:55:42 2009 New Revision: 886187 URL: http://svn.apache.org/viewvc?rev=886187&view=rev Log: (empty) Added: lucene/java/tags/flex_1458_3_0_back_compat_tests_20091202/ (props changed) - copied from r886186, lucene/java/branches/flex_1458_3_0_back_compat_tests/ Propchange: lucene/java/tags/flex_1458_3_0_back_compat_tests_20091202/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Dec 2 15:55:42 2009 @@ -0,0 +1,13 @@ +build +dist +*~ +velocity.log +build.properties +.idea +*.iml +*.ipr +*.iws +.project +.classpath +.settings +prj.el Propchange: lucene/java/tags/flex_1458_3_0_back_compat_tests_20091202/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Dec 2 15:55:42 2009 @@ -0,0 +1,5 @@ +/lucene/java/branches/lucene_2_4:748824 +/lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036 +/lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336 +/lucene/java/branches/lucene_3_0:880754,880793,880823,881216,881317,881376,881473,881549,881820,882467,882890,883076,883080 +/lucene/java/trunk:881213,881315,881466,881819,882374,882807,882888,882977,883074-883075 From java-commits-fgray@example.com Wed Dec 02 16:09:33 2009 Return-Path: <java-commits-fgray@example.com> Delivered-To: fgray@example.com Received: (qmail 83337 invoked from network); 2 Dec 2009 16:09:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Dec 2009 16:09:33 -0000 Received: (qmail 74877 invoked by uid 500); 2 Dec 2009 16:09:32 -0000 Delivered-To: fgray@example.com Received: (qmail 74789 invoked by uid 500); 2 Dec 2009 16:09:32 -0000 Mailing-List: contact fgray@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:fgray@example.com> List-Unsubscribe: <mailto:fgray@example.com> List-Post: <mailto:fgray@example.com> List-Id: <java-commits.lucene.apache.org> Reply-To: fgray@example.com Delivered-To: mailing list fgray@example.com Received: (qmail 74780 invoked by uid 99); 2 Dec 2009 16:09:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 16:09:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 16:09:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 971BC23888EC; Wed, 2 Dec 2009 16:08:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r886190 - in /lucene/java/trunk: ./ contrib/ contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/ contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/ contrib/analyzers/common/src/test/org/apache/lucene/analysis... Date: Wed, 02 Dec 2009 16:08:57 -0000 To: fgray@example.com From: fgray@example.com X-Mailer: svnmailer-1.0.8 Message-Id: <fgray@example.com> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmuir Date: Wed Dec 2 16:08:56 2009 New Revision: 886190 URL: http://svn.apache.org/viewvc?rev=886190&view=rev Log: LUCENE-2062: Bulgarian Analyzer Added: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java (with props) lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java (with props) lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java (with props) lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/package.html (with props) lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/ lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt (with props) lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java (with props) lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java (with props) Modified: lucene/java/trunk/NOTICE.txt lucene/java/trunk/contrib/CHANGES.txt Modified: lucene/java/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/lucene/java/trunk/NOTICE.txt?rev=886190&r1=886189&r2=886190&view=diff ============================================================================== --- lucene/java/trunk/NOTICE.txt (original) +++ lucene/java/trunk/NOTICE.txt Wed Dec 2 16:08:56 2009 @@ -20,6 +20,11 @@ contrib/analyzers/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt. See http://members.unine.ch/jacques.savoy/clef/index.html. +The Bulgarian analyzer (contrib/analyzers) comes with a default +stopword list that is BSD-licensed created by Jacques Savoy. The file resides in +contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt. +See http://members.unine.ch/jacques.savoy/clef/index.html. + Includes lib/servlet-api-2.4.jar from Apache Tomcat The SmartChineseAnalyzer source code (under contrib/analyzers) was Modified: lucene/java/trunk/contrib/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/CHANGES.txt?rev=886190&r1=886189&r2=886190&view=diff ============================================================================== --- lucene/java/trunk/contrib/CHANGES.txt (original) +++ lucene/java/trunk/contrib/CHANGES.txt Wed Dec 2 16:08:56 2009 @@ -15,6 +15,8 @@ * LUCENE-2067: Add a Czech light stemmer. CzechAnalyzer will now stem words when Version is set to 3.1 or higher. (Robert Muir) + * LUCENE-2062: Add a Bulgarian analyzer. (Robert Muir, Simon Willnauer) + ======================= Release 3.0.0 2009-11-25 ======================= Added: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java?rev=886190&view=auto ============================================================================== --- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java (added) +++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java Wed Dec 2 16:08:56 2009 @@ -0,0 +1,176 @@ +package org.apache.lucene.analysis.bg; + +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.Collections; +import java.util.Set; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.CharArraySet; +import org.apache.lucene.analysis.LowerCaseFilter; +import org.apache.lucene.analysis.StopFilter; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.Tokenizer; +import org.apache.lucene.analysis.WordlistLoader; +import org.apache.lucene.analysis.standard.StandardFilter; +import org.apache.lucene.analysis.standard.StandardTokenizer; +import org.apache.lucene.util.Version; + +/** + * {@link Analyzer} for Bulgarian. + * <p> + * This analyzer implements light-stemming as specified by: <i> Searching + * Strategies for the Bulgarian Language </i> + * http://members.unine.ch/jacques.savoy/Papers/BUIR.pdf + * <p> + */ +public final class BulgarianAnalyzer extends Analyzer { + + /** + * File containing default Bulgarian stopwords. + * + * Default stopword list is from + * http://members.unine.ch/jacques.savoy/clef/index.html The stopword list is + * BSD-Licensed. + */ + public final static String DEFAULT_STOPWORD_FILE = "stopwords.txt"; + + /** + * Contains the stopwords used with the StopFilter. + */ + private final Set<?> stoptable; + /** + * The comment character in the stopwords file. All lines prefixed with this + * will be ignored + */ + public static final String STOPWORDS_COMMENT = "#"; + + /** + * Returns an unmodifiable instance of the default stop-words set. + * + * @return an unmodifiable instance of the default stop-words set. + */ + public static Set<String> getDefaultStopSet() { + return DefaultSetHolder.DEFAULT_STOP_SET; + } + + /** + * Atomically loads the DEFAULT_STOP_SET in a lazy fashion once the outer + * class accesses the static final set the first time.; + */ + private static class DefaultSetHolder { + static final Set<String> DEFAULT_STOP_SET; + + static { + try { + DEFAULT_STOP_SET = loadDefaultStopWordSet(); + } catch (Exception ex) { + // default set should always be present as it is part of the + // distribution (JAR) + throw new RuntimeException("Unable to load default stopword set", ex); + } + } + + static Set<String> loadDefaultStopWordSet() throws IOException { + final InputStream stream = BulgarianAnalyzer.class + .getResourceAsStream(DEFAULT_STOPWORD_FILE); + try { + InputStreamReader reader = new InputStreamReader(stream, "UTF-8"); + // make sure it is unmodifiable as we expose it in the outer class + return Collections.unmodifiableSet(WordlistLoader.getWordSet(reader, + STOPWORDS_COMMENT)); + } finally { + if(stream != null) + stream.close(); + } + } + } + + private final Version matchVersion; + + /** + * Builds an analyzer with the default stop words: + * {@link #DEFAULT_STOPWORD_FILE}. + */ + public BulgarianAnalyzer(Version matchVersion) { + this(matchVersion, DefaultSetHolder.DEFAULT_STOP_SET); + } + + /** + * Builds an analyzer with the given stop words. + */ + public BulgarianAnalyzer(Version matchVersion, Set<?> stopwords) { + super(); + stoptable = CharArraySet.unmodifiableSet(CharArraySet.copy(matchVersion, + stopwords)); + this.matchVersion = matchVersion; + } + + /** + * Creates a {@link TokenStream} which tokenizes all the text in the provided + * {@link Reader}. + * + * @return A {@link TokenStream} built from an {@link StandardTokenizer} + * filtered with {@link StandardFilter}, {@link LowerCaseFilter}, + * {@link StopFilter}, and {@link BulgarianStemFilter}. + */ + @Override + public TokenStream tokenStream(String fieldName, Reader reader) { + TokenStream result = new StandardTokenizer(matchVersion, reader); + result = new StandardFilter(result); + result = new LowerCaseFilter(matchVersion, result); + result = new StopFilter(matchVersion, result, stoptable); + result = new BulgarianStemFilter(result); + return result; + } + + private class SavedStreams { + Tokenizer source; + TokenStream result; + }; + + /** + * Returns a (possibly reused) {@link TokenStream} which tokenizes all the + * text in the provided {@link Reader}. + * + * @return A {@link TokenStream} built from an {@link StandardTokenizer} + * filtered with {@link StandardFilter}, {@link LowerCaseFilter}, + * {@link StopFilter}, and {@link BulgarianStemFilter}. + */ + @Override + public TokenStream reusableTokenStream(String fieldName, Reader reader) + throws IOException { + SavedStreams streams = (SavedStreams) getPreviousTokenStream(); + if (streams == null) { + streams = new SavedStreams(); + streams.source = new StandardTokenizer(matchVersion, reader); + streams.result = new StandardFilter(streams.source); + streams.result = new LowerCaseFilter(matchVersion, streams.result); + streams.result = new StopFilter(matchVersion, streams.result, stoptable); + streams.result = new BulgarianStemFilter(streams.result); + setPreviousTokenStream(streams); + } else { + streams.source.reset(reader); + } + return streams.result; + } +} Propchange: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java ------------------------------------------------------------------------------ svn:eol-style = native Added: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java?rev=886190&view=auto ============================================================================== --- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java (added) +++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java Wed Dec 2 16:08:56 2009 @@ -0,0 +1,50 @@ +package org.apache.lucene.analysis.bg; + +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.IOException; + +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.tokenattributes.TermAttribute; + +/** + * A {@link TokenFilter} that applies {@link BulgarianStemmer} to stem Bulgarian + * words. + */ +public final class BulgarianStemFilter extends TokenFilter { + private final BulgarianStemmer stemmer; + private final TermAttribute termAtt; + + public BulgarianStemFilter(final TokenStream input) { + super(input); + stemmer = new BulgarianStemmer(); + termAtt = addAttribute(TermAttribute.class); + } + + @Override + public boolean incrementToken() throws IOException { + if (input.incrementToken()) { + final int newlen = stemmer.stem(termAtt.termBuffer(), termAtt.termLength()); + termAtt.setTermLength(newlen); + return true; + } else { + return false; + } + } +} Propchange: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java ------------------------------------------------------------------------------ svn:eol-style = native Added: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java?rev=886190&view=auto ============================================================================== --- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java (added) +++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java Wed Dec 2 16:08:56 2009 @@ -0,0 +1,152 @@ +package org.apache.lucene.analysis.bg; + +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Light Stemmer for Bulgarian. + * <p> + * Implements the algorithm described in: + * <i> + * Searching Strategies for the Bulgarian Language + * </i> + * http://members.unine.ch/jacques.savoy/Papers/BUIR.pdf + */ +public class BulgarianStemmer { + + /** + * Stem an input buffer of Bulgarian text. + * + * @param s input buffer + * @param len length of input buffer + * @return length of input buffer after normalization + */ + public int stem(final char s[], int len) { + if (len < 4) // do not stem + return len; + + if (len > 5 && endsWith(s, len, "ища")) + return len - 3; + + len = removeArticle(s, len); + len = removePlural(s, len); + + if (len > 3) { + if (endsWith(s, len, "я")) + len--; + if (endsWith(s, len, "а") || + endsWith(s, len, "о") || + endsWith(s, len, "е")) + len--; + } + + // the rule to rewrite ен -> н is duplicated in the paper. + // in the perl implementation referenced by the paper, this is fixed. + // (it is fixed here as well) + if (len > 4 && endsWith(s, len, "ен")) { + s[len - 2] = 'н'; // replace with н + len--; + } + + if (len > 5 && s[len - 2] == 'ъ') { + s[len - 2] = s[len - 1]; // replace ъN with N + len--; + } + + return len; + } + + /** + * Mainly remove the definite article + * @param s input buffer + * @param len length of input buffer + * @return new stemmed length + */ + private int removeArticle(final char s[], final int len) { + if (len > 6 && endsWith(s, len, "ият")) + return len - 3; + + if (len > 5) { + if (endsWith(s, len, "ът") || + endsWith(s, len, "то") || + endsWith(s, len, "те") || + endsWith(s, len, "та") || + endsWith(s, len, "ия")) + return len - 2; + } + + if (len > 4 && endsWith(s, len, "ят")) + return len - 2; + + return len; + } + + private int removePlural(final char s[], final int len) { + if (len > 6) { + if (endsWith(s, len, "овци")) + return len - 3; // replace with о + if (endsWith(s, len, "ове")) + return len - 3; + if (endsWith(s, len, "еве")) { + s[len - 3] = 'й'; // replace with й + return len - 2; + } + } + + if (len > 5) { + if (endsWith(s, len, "ища")) + return len - 3; + if (endsWith(s, len, "та")) + return len - 2; + if (endsWith(s, len, "ци")) { + s[len - 2] = 'к'; // replace with к + return len - 1; + } + if (endsWith(s, len, "зи")) { + s[len - 2] = 'г'; // replace with г + return len - 1; + } + + if (s[len - 3] == 'е' && s[len - 1] == 'и') { + s[len - 3] = 'я'; // replace е with я, remove и + return len - 1; + } + } + + if (len > 4) { + if (endsWith(s, len, "си")) { + s[len - 2] = 'х'; // replace with х + return len - 1; + } + if (endsWith(s, len, "и")) + return len - 1; + } + + return len; + } + + private boolean endsWith(final char s[], final int len, final String suffix) { + final int suffixLen = suffix.length(); + if (suffixLen > len) + return false; + for (int i = suffixLen - 1; i >= 0; i--) + if (s[len -(suffixLen - i)] != suffix.charAt(i)) + return false; + + return true; + } +} Propchange: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java ------------------------------------------------------------------------------ svn:eol-style = native Added: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/package.html URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/package.html?rev=886190&view=auto ============================================================================== --- lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/package.html (added) +++ lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/package.html Wed Dec 2 16:08:56 2009 @@ -0,0 +1,22 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<html><head></head> +<body> +Analyzer for Bulgarian. +</body> +</html> Propchange: lucene/java/trunk/contrib/analyzers/common/src/java/org/apache/lucene/analysis/bg/package.html ------------------------------------------------------------------------------ svn:eol-style = native Added: lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt?rev=886190&view=auto ============================================================================== --- lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt (added) +++ lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt Wed Dec 2 16:08:56 2009 @@ -0,0 +1,193 @@ +# This file was created by Jacques Savoy and is distributed under the BSD license. +# See http://members.unine.ch/jacques.savoy/clef/index.html. +# Also see http://www.opensource.org/licenses/bsd-license.html +а +аз +ако +ала +бе +без +беше +би +бил +била +били +било +близо +бъдат +бъде +бяха +в +вас +ваш +ваша +вероятно +вече +взема +ви +вие +винаги +все +всеки +всички +всичко +всяка +във +въпреки +върху +г +ги +главно +го +д +да +дали +до +докато +докога +дори +досега +доста +е +едва +един +ето +за +зад +заедно +заради +засега +затова +защо +защото +и +из +или +им +има +имат +иска +й +каза +как +каква +какво +както +какъв +като +кога +когато +което +които +кой +който +колко +която +къде +където +към +ли +м +ме +между +мен +ми +мнозина +мога +могат +може +моля +момента +му +н +на +над +назад +най +направи +напред +например +нас +не +него +нея +ни +ние +никой +нито +но +някои +някой +няма +обаче +около +освен +особено +от +отгоре +отново +още +пак +по +повече +повечето +под +поне +поради +после +почти +прави +пред +преди +през +при +пък +първо +с +са +само +се +сега +си +скоро +след +сме +според +сред +срещу +сте +съм +със +също +т +тази +така +такива +такъв +там +твой +те +тези +ти +тн +то +това +тогава +този +той +толкова +точно +трябва +тук +тъй +тя +тях +у +харесва +ч +че +често +чрез +ще +щом +я Propchange: lucene/java/trunk/contrib/analyzers/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java?rev=886190&view=auto ============================================================================== --- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java (added) +++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java Wed Dec 2 16:08:56 2009 @@ -0,0 +1,70 @@ +package org.apache.lucene.analysis.bg; + +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.IOException; +import java.util.Collections; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.util.Version; + +/** + * Test the Bulgarian analyzer + */ +public class TestBulgarianAnalyzer extends BaseTokenStreamTestCase { + + /** + * This test fails with NPE when the stopwords file is missing in classpath + */ + public void testResourcesAvailable() { + new BulgarianAnalyzer(Version.LUCENE_CURRENT); + } + + public void testStopwords() throws IOException { + Analyzer a = new BulgarianAnalyzer(Version.LUCENE_CURRENT); + assertAnalyzesTo(a, "Как се казваш?", new String[] {"казваш"}); + } + + public void testCustomStopwords() throws IOException { + Analyzer a = new BulgarianAnalyzer(Version.LUCENE_CURRENT, Collections + .emptySet()); + assertAnalyzesTo(a, "Как се казваш?", + new String[] {"как", "се", "казваш"}); + } + + public void testReusableTokenStream() throws IOException { + Analyzer a = new BulgarianAnalyzer(Version.LUCENE_CURRENT); + assertAnalyzesToReuse(a, "документи", new String[] {"документ"}); + assertAnalyzesToReuse(a, "документ", new String[] {"документ"}); + } + + /** + * Test some examples from the paper + */ + public void testBasicExamples() throws IOException { + Analyzer a = new BulgarianAnalyzer(Version.LUCENE_CURRENT); + assertAnalyzesTo(a, "енергийни кризи", new String[] {"енергийн", "криз"}); + assertAnalyzesTo(a, "Атомната енергия", new String[] {"атомн", "енерг"}); + + assertAnalyzesTo(a, "компютри", new String[] {"компютр"}); + assertAnalyzesTo(a, "компютър", new String[] {"компютр"}); + + assertAnalyzesTo(a, "градове", new String[] {"град"}); + } +} Propchange: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java ------------------------------------------------------------------------------ svn:eol-style = native Added: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java?rev=886190&view=auto ============================================================================== --- lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java (added) +++ lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java Wed Dec 2 16:08:56 2009 @@ -0,0 +1,210 @@ +package org.apache.lucene.analysis.bg; + +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.IOException; + +import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.util.Version; + +/** + * Test the Bulgarian Stemmer + */ +public class TestBulgarianStemmer extends BaseTokenStreamTestCase { + /** + * Test showing how masculine noun forms conflate. An example noun for each + * common (and some rare) plural pattern is listed. + */ + public void testMasculineNouns() throws IOException { + BulgarianAnalyzer a = new BulgarianAnalyzer(Version.LUCENE_CURRENT); + + // -и pattern + assertAnalyzesTo(a, "град", new String[] {"град"}); + assertAnalyzesTo(a, "града", new String[] {"град"}); + assertAnalyzesTo(a, "градът", new String[] {"град"}); + assertAnalyzesTo(a, "градове", new String[] {"град"}); + assertAnalyzesTo(a, "градовете", new String[] {"град"}); + + // -ове pattern + assertAnalyzesTo(a, "народ", new String[] {"народ"}); + assertAnalyzesTo(a, "народа", new String[] {"народ"}); + assertAnalyzesTo(a, "народът", new String[] {"народ"}); + assertAnalyzesTo(a, "народи", new String[] {"народ"}); + assertAnalyzesTo(a, "народите", new String[] {"народ"}); + assertAnalyzesTo(a, "народе", new String[] {"народ"}); + + // -ища pattern + assertAnalyzesTo(a, "път", new String[] {"път"}); + assertAnalyzesTo(a, "пътя", new String[] {"път"}); + assertAnalyzesTo(a, "пътят", new String[] {"път"}); + assertAnalyzesTo(a, "пътища", new String[] {"път"}); + assertAnalyzesTo(a, "пътищата", new String[] {"път"}); + + // -чета pattern + assertAnalyzesTo(a, "градец", new String[] {"градец"}); + assertAnalyzesTo(a, "градеца", new String[] {"градец"}); + assertAnalyzesTo(a, "градецът", new String[] {"градец"}); + /* note the below forms conflate with each other, but not the rest */ + assertAnalyzesTo(a, "градовце", new String[] {"градовц"}); + assertAnalyzesTo(a, "градовцете", new String[] {"градовц"}); + + // -овци pattern + assertAnalyzesTo(a, "дядо", new String[] {"дяд"}); + assertAnalyzesTo(a, "дядото", new String[] {"дяд"}); + assertAnalyzesTo(a, "дядовци", new String[] {"дяд"}); + assertAnalyzesTo(a, "дядовците", new String[] {"дяд"}); + + // -е pattern + assertAnalyzesTo(a, "мъж", new String[] {"мъж"}); + assertAnalyzesTo(a, "мъжа", new String[] {"мъж"}); + assertAnalyzesTo(a, "мъже", new String[] {"мъж"}); + assertAnalyzesTo(a, "мъжете", new String[] {"мъж"}); + assertAnalyzesTo(a, "мъжо", new String[] {"мъж"}); + /* word is too short, will not remove -ът */ + assertAnalyzesTo(a, "мъжът", new String[] {"мъжът"}); + + // -а pattern + assertAnalyzesTo(a, "крак", new String[] {"крак"}); + assertAnalyzesTo(a, "крака", new String[] {"крак"}); + assertAnalyzesTo(a, "кракът", new String[] {"крак"}); + assertAnalyzesTo(a, "краката", new String[] {"крак"}); + + // брат + assertAnalyzesTo(a, "брат", new String[] {"брат"}); + assertAnalyzesTo(a, "брата", new String[] {"брат"}); + assertAnalyzesTo(a, "братът", new String[] {"брат"}); + assertAnalyzesTo(a, "братя", new String[] {"брат"}); + assertAnalyzesTo(a, "братята", new String[] {"брат"}); + assertAnalyzesTo(a, "брате", new String[] {"брат"}); + } + + /** + * Test showing how feminine noun forms conflate + */ + public void testFeminineNouns() throws IOException { + BulgarianAnalyzer a = new BulgarianAnalyzer(Version.LUCENE_CURRENT); + + assertAnalyzesTo(a, "вест", new String[] {"вест"}); + assertAnalyzesTo(a, "вестта", new String[] {"вест"}); + assertAnalyzesTo(a, "вести", new String[] {"вест"}); + assertAnalyzesTo(a, "вестите", new String[] {"вест"}); + } + + /** + * Test showing how neuter noun forms conflate an example noun for each common + * plural pattern is listed + */ + public void testNeuterNouns() throws IOException { + BulgarianAnalyzer a = new BulgarianAnalyzer(Version.LUCENE_CURRENT); + + // -а pattern + assertAnalyzesTo(a, "дърво", new String[] {"дърв"}); + assertAnalyzesTo(a, "дървото", new String[] {"дърв"}); + assertAnalyzesTo(a, "дърва", new String[] {"дърв"}); + assertAnalyzesTo(a, "дървета", new String[] {"дърв"}); + assertAnalyzesTo(a, "дървата", new String[] {"дърв"}); + assertAnalyzesTo(a, "дърветата", new String[] {"дърв"}); + + // -та pattern + assertAnalyzesTo(a, "море", new String[] {"мор"}); + assertAnalyzesTo(a, "морето", new String[] {"мор"}); + assertAnalyzesTo(a, "морета", new String[] {"мор"}); + assertAnalyzesTo(a, "моретата", new String[] {"мор"}); + + // -я pattern + assertAnalyzesTo(a, "изключение", new String[] {"изключени"}); + assertAnalyzesTo(a, "изключението", new String[] {"изключени"}); + assertAnalyzesTo(a, "изключенията", new String[] {"изключени"}); + /* note the below form in this example does not conflate with the rest */ + assertAnalyzesTo(a, "изключения", new String[] {"изключн"}); + } + + /** + * Test showing how adjectival forms conflate + */ + public void testAdjectives() throws IOException { + BulgarianAnalyzer a = new BulgarianAnalyzer(Version.LUCENE_CURRENT); + assertAnalyzesTo(a, "красив", new String[] {"красив"}); + assertAnalyzesTo(a, "красивия", new String[] {"красив"}); + assertAnalyzesTo(a, "красивият", new String[] {"красив"}); + assertAnalyzesTo(a, "красива", new String[] {"красив"}); + assertAnalyzesTo(a, "красивата", new String[] {"красив"}); + assertAnalyzesTo(a, "красиво", new String[] {"красив"}); + assertAnalyzesTo(a, "красивото", new String[] {"красив"}); + assertAnalyzesTo(a, "красиви", new String[] {"красив"}); + assertAnalyzesTo(a, "красивите", new String[] {"красив"}); + } + + /** + * Test some exceptional rules, implemented as rewrites. + */ + public void testExceptions() throws IOException { + BulgarianAnalyzer a = new BulgarianAnalyzer(Version.LUCENE_CURRENT); + + // ци -> к + assertAnalyzesTo(a, "собственик", new String[] {"собственик"}); + assertAnalyzesTo(a, "собственика", new String[] {"собственик"}); + assertAnalyzesTo(a, "собственикът", new String[] {"собственик"}); + assertAnalyzesTo(a, "собственици", new String[] {"собственик"}); + assertAnalyzesTo(a, "собствениците", new String[] {"собственик"}); + + // зи -> г + assertAnalyzesTo(a, "подлог", new String[] {"подлог"}); + assertAnalyzesTo(a, "подлога", new String[] {"подлог"}); + assertAnalyzesTo(a, "подлогът", new String[] {"подлог"}); + assertAnalyzesTo(a, "подлози", new String[] {"подлог"}); + assertAnalyzesTo(a, "подлозите", new String[] {"подлог"}); + + // си -> х + assertAnalyzesTo(a, "кожух", new String[] {"кожух"}); + assertAnalyzesTo(a, "кожуха", new String[] {"кожух"}); + assertAnalyzesTo(a, "кожухът", new String[] {"кожух"}); + assertAnalyzesTo(a, "кожуси", new String[] {"кожух"}); + assertAnalyzesTo(a, "кожусите", new String[] {"кожух"}); + + // ъ deletion + assertAnalyzesTo(a, "център", new String[] {"центр"}); + assertAnalyzesTo(a, "центъра", new String[] {"центр"}); + assertAnalyzesTo(a, "центърът", new String[] {"центр"}); + assertAnalyzesTo(a, "центрове", new String[] {"центр"}); + assertAnalyzesTo(a, "центровете", new String[] {"центр"}); + + // е*и -> я* + assertAnalyzesTo(a, "промяна", new String[] {"промян"}); + assertAnalyzesTo(a, "промяната", new String[] {"промян"}); + assertAnalyzesTo(a, "промени", new String[] {"промян"}); + assertAnalyzesTo(a, "промените", new String[] {"промян"}); + + // ен -> н + assertAnalyzesTo(a, "песен", new String[] {"песн"}); + assertAnalyzesTo(a, "песента", new String[] {"песн"}); + assertAnalyzesTo(a, "песни", new String[] {"песн"}); + assertAnalyzesTo(a, "песните", new String[] {"песн"}); + + // -еве -> й + // note: this is the only word i think this rule works for. + // most -еве pluralized nouns are monosyllabic, + // and the stemmer requires length > 6... + assertAnalyzesTo(a, "строй", new String[] {"строй"}); + assertAnalyzesTo(a, "строеве", new String[] {"строй"}); + assertAnalyzesTo(a, "строевете", new String[] {"строй"}); + /* note the below forms conflate with each other, but not the rest */ + assertAnalyzesTo(a, "строя", new String[] {"стр"}); + assertAnalyzesTo(a, "строят", new String[] {"стр"}); + } +} Propchange: lucene/java/trunk/contrib/analyzers/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java ------------------------------------------------------------------------------ svn:eol-style = native From java-commits-fgray@example.com Wed Dec 02 17:27:40 2009 Return-Path: <java-commits-fgray@example.com> Delivered-To: fgray@example.com Received: (qmail 19101 invoked from network); 2 Dec 2009 17:27:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Dec 2009 17:27:40 -0000 Received: (qmail 26953 invoked by uid 500); 2 Dec 2009 17:27:40 -0000 Delivered-To: fgray@example.com Received: (qmail 26907 invoked by uid 500); 2 Dec 2009 17:27:40 -0000 Mailing-List: contact fgray@example.com; run by ezmlm Precedence: bulk List-Help: <mailto:fgray@example.com> List-Unsubscribe: <mailto:fgray@example.com> List-Post: <mailto:fgray@example.com> List-Id: <java-commits.lucene.apache.org> Reply-To: fgray@example.com Delivered-To: mailing list fgray@example.com Received: (qmail 26898 invoked by uid 99); 2 Dec 2009 17:27:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 17:27:40 +0000 X-ASF-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 17:27:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0FB87238898A; Wed, 2 Dec 2009 17:27:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn
{'source': 'Apache Software Foundation Public Mail Archives'}