Author: metskem
Date: Sun Mar 17 18:26:35 2013
New Revision: 1457510
URL: http://svn.apache.org/r1457510
Log:
2013-03-17 Harry Metske <[email protected]>
* 2.9.1-svn-30
* fixed JSPWIKI-765): lucene search returns 3 results at max, discovered
by Dave Koelmeyer
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/org/apache/wiki/search/LuceneSearchProvider.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1457510&r1=1457509&r2=1457510&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Mar 17 18:26:35 2013
@@ -1,3 +1,9 @@
+2013-03-17 Harry Metske <[email protected]>
+
+ * 2.9.1-svn-30
+
+ * fixed JSPWIKI-765): lucene search returns 3 results at max,
discovered by Dave Koelmeyer
+
2013-03-6 Glen Mazza (glenmazza AT apache DOT org)
* Upgraded Maven's tomcat plugin to latest version 2.1
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1457510&r1=1457509&r2=1457510&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Sun Mar 17
18:26:35 2013
@@ -75,7 +75,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "29";
+ public static final String BUILD = "30";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/org/apache/wiki/search/LuceneSearchProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/search/LuceneSearchProvider.java?rev=1457510&r1=1457509&r2=1457510&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/org/apache/wiki/search/LuceneSearchProvider.java
(original)
+++
incubator/jspwiki/trunk/src/org/apache/wiki/search/LuceneSearchProvider.java
Sun Mar 17 18:26:35 2013
@@ -33,10 +33,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.queryParser.MultiFieldQueryParser;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.*;
import org.apache.lucene.search.highlight.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
@@ -92,6 +89,9 @@ public class LuceneSearchProvider implem
/** Maximum number of fragments from search matches. */
private static final int MAX_FRAGMENTS = 3;
+ /** The maximum number of hits to return from searches. */
+ public static final int MAX_SEARCH_HITS = 99999;
+
private static String c_punctuationSpaces = StringUtils.repeat(" ",
MarkupParser.PUNCTUATION_CHARS_ALLOWED.length() );
/**
@@ -617,7 +617,7 @@ public class LuceneSearchProvider implem
return null;
}
- ScoreDoc[] hits = searcher.search(luceneQuery,
MAX_FRAGMENTS).scoreDocs;
+ ScoreDoc[] hits = searcher.search(luceneQuery,
MAX_SEARCH_HITS).scoreDocs;
list = new ArrayList<SearchResult>(hits.length);
for ( int curr = 0; curr < hits.length; curr++ )
