Return-Path: Delivered-To: apmail-lucene-lucene-net-commits-archive@www.apache.org Received: (qmail 70309 invoked from network); 11 Mar 2010 16:34:03 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Mar 2010 16:34:03 -0000 Received: (qmail 89257 invoked by uid 500); 11 Mar 2010 16:33:29 -0000 Delivered-To: apmail-lucene-lucene-net-commits-archive@lucene.apache.org Received: (qmail 89202 invoked by uid 500); 11 Mar 2010 16:33:28 -0000 Mailing-List: contact lucene-net-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucene.apache.org Delivered-To: mailing list lucene-net-commits@lucene.apache.org Received: (qmail 89192 invoked by uid 99); 11 Mar 2010 16:33:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Mar 2010 16:33:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 11 Mar 2010 16:33:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0171A2388A44; Thu, 11 Mar 2010 16:33:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r921924 - /lucene/lucene.net/trunk/C#/contrib/FastVectorHighlighter.Net/FastVectorHighlighter.Net/FieldQuery.cs Date: Thu, 11 Mar 2010 16:33:04 -0000 To: lucene-net-commits@lucene.apache.org From: digy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100311163305.0171A2388A44@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: digy Date: Thu Mar 11 16:33:04 2010 New Revision: 921924 URL: http://svn.apache.org/viewvc?rev=921924&view=rev Log: LUCENENET-349 FieldMatch not working in FastVectorHighlighter Modified: lucene/lucene.net/trunk/C#/contrib/FastVectorHighlighter.Net/FastVectorHighlighter.Net/FieldQuery.cs Modified: lucene/lucene.net/trunk/C#/contrib/FastVectorHighlighter.Net/FastVectorHighlighter.Net/FieldQuery.cs URL: http://svn.apache.org/viewvc/lucene/lucene.net/trunk/C%23/contrib/FastVectorHighlighter.Net/FastVectorHighlighter.Net/FieldQuery.cs?rev=921924&r1=921923&r2=921924&view=diff ============================================================================== --- lucene/lucene.net/trunk/C#/contrib/FastVectorHighlighter.Net/FastVectorHighlighter.Net/FieldQuery.cs (original) +++ lucene/lucene.net/trunk/C#/contrib/FastVectorHighlighter.Net/FastVectorHighlighter.Net/FieldQuery.cs Thu Mar 11 16:33:04 2010 @@ -282,8 +282,7 @@ namespace Lucene.Net.Search.Vectorhighli public List getTermSet(String field) { - if (!fieldMatch) return null; - return termSetMap.Get(field); + return termSetMap.Get(fieldMatch ? field : null); } /** @@ -313,8 +312,7 @@ namespace Lucene.Net.Search.Vectorhighli private QueryPhraseMap GetRootMap(String fieldName) { - if (!fieldMatch) return null; - return rootMaps.Get(fieldName); + return rootMaps.Get(fieldMatch ? fieldName : null); } int NextTermOrPhraseNumber()