Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 48065 invoked from network); 11 Dec 2007 08:13:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Dec 2007 08:13:10 -0000 Received: (qmail 97173 invoked by uid 500); 11 Dec 2007 08:12:58 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 97141 invoked by uid 500); 11 Dec 2007 08:12:58 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 97130 invoked by uid 99); 11 Dec 2007 08:12:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Dec 2007 00:12:58 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Dec 2007 08:13:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D2BFA1A9832; Tue, 11 Dec 2007 00:12:45 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r603171 - in /cocoon/trunk/blocks: ./ cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/ Date: Tue, 11 Dec 2007 08:11:47 -0000 To: cvs@cocoon.apache.org From: giacomo@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071211081245.D2BFA1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: giacomo Date: Tue Dec 11 00:11:42 2007 New Revision: 603171 URL: http://svn.apache.org/viewvc?rev=603171&view=rev Log: fixed cocoon-querybean according to new Lucene API Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneCriterionBean.java cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java cocoon/trunk/blocks/pom.xml Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneCriterionBean.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneCriterionBean.java?rev=603171&r1=603170&r2=603171&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneCriterionBean.java (original) +++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneCriterionBean.java Tue Dec 11 00:11:42 2007 @@ -26,6 +26,7 @@ import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.index.Term; +import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.PhraseQuery; @@ -124,7 +125,7 @@ if (words.size() > 1) { query = new BooleanQuery(); for (int i = 0; i < words.size(); i++) { - ((BooleanQuery)query).add(new TermQuery(new Term(f, (String)words.elementAt(i))), false, false); + ((BooleanQuery)query).add(new TermQuery(new Term(f, (String)words.elementAt(i))), BooleanClause.Occur.SHOULD); } } else if (words.size() == 1) { query = new TermQuery(new Term(f, (String)words.elementAt(0))); @@ -135,7 +136,7 @@ if (words.size() > 1) { query = new BooleanQuery(); for (int i = 0; i < words.size(); i++) { - ((BooleanQuery)query).add(new TermQuery(new Term (f, (String)words.elementAt(i))), true, false); + ((BooleanQuery)query).add(new TermQuery(new Term (f, (String)words.elementAt(i))), BooleanClause.Occur.MUST); } } else if (words.size() == 1) { query = new TermQuery(new Term(f, (String)words.elementAt(0))); @@ -146,7 +147,7 @@ if (words.size() > 1) { query = new BooleanQuery(); for (int i = 0; i < words.size(); i++) { - ((BooleanQuery)query).add(new TermQuery(new Term(f, (String)words.elementAt(i))), true, true); + ((BooleanQuery)query).add(new TermQuery(new Term(f, (String)words.elementAt(i))), BooleanClause.Occur.MUST_NOT); } } else if (words.size() == 1) { query = new TermQuery(new Term(f, (String)words.elementAt(0))); @@ -157,7 +158,7 @@ if (words.size() > 1) { query = new BooleanQuery(); for (int i = 0; i < words.size(); i++) { - ((BooleanQuery)query).add(new FuzzyQuery(new Term(f, (String)words.elementAt(i))), false, false); + ((BooleanQuery)query).add(new FuzzyQuery(new Term(f, (String)words.elementAt(i))), BooleanClause.Occur.SHOULD); } } else if (words.size() == 1) { query = new FuzzyQuery(new Term(f, (String)words.elementAt(0))); Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java?rev=603171&r1=603170&r2=603171&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java (original) +++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/src/main/java/org/apache/cocoon/bean/query/SimpleLuceneQueryBean.java Tue Dec 11 00:11:42 2007 @@ -30,6 +30,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.search.Hits; import org.apache.lucene.search.Query; +import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.cocoon.components.search.LuceneCocoonSearcher; import org.apache.cocoon.ProcessingException; @@ -184,7 +185,15 @@ while (it.hasNext()) { SimpleLuceneCriterion criterion = (SimpleLuceneCriterion)it.next(); Query subquery = criterion.getQuery (searcher.getAnalyzer()); - query.add(subquery, required, criterion.isProhibited()); + if(!required) { + if(criterion.isProhibited()) { + query.add(subquery, BooleanClause.Occur.MUST_NOT); + } else { + query.add(subquery, BooleanClause.Occur.SHOULD); + } + } else { + query.add(subquery, BooleanClause.Occur.MUST); + } } Hits hits = searcher.search(query); this.total = new Long (hits.length()); Modified: cocoon/trunk/blocks/pom.xml URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?rev=603171&r1=603170&r2=603171&view=diff ============================================================================== --- cocoon/trunk/blocks/pom.xml (original) +++ cocoon/trunk/blocks/pom.xml Tue Dec 11 00:11:42 2007 @@ -200,10 +200,8 @@ cocoon-python/cocoon-python-mocks cocoon-qdox/cocoon-qdox-impl cocoon-qdox/cocoon-qdox-sample - cocoon-repository/cocoon-repository-impl cocoon-scratchpad/cocoon-scratchpad-impl cocoon-scratchpad/cocoon-scratchpad-sample