[jsword-svn]
jsword/java/jsword/org/crosswire/jsword/book/search/lucene s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Mon May 16 17:43:18 MST 2005
Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene
In directory www.crosswire.org:/tmp/cvs-serv23836/java/jsword/org/crosswire/jsword/book/search/lucene
Modified Files:
Query.java IndexSearcher.java Msg.java AndQuery.java
BlurQuery.java OrQuery.java LuceneIndexManager.java
AbstractBinaryQuery.java LuceneIndex.java BaseQuery.java
ExtendedLuceneSyntax.java AndNotQuery.java QueryBuilder.java
RangeQuery.java
Log Message:
Added support for CheckStyle plugin.
Added a few more CheckStyle rules.
Fixed a spelling mistake.
Index: RangeQuery.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/RangeQuery.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RangeQuery.java 10 May 2005 02:39:22 -0000 1.4
--- RangeQuery.java 17 May 2005 00:43:16 -0000 1.5
***************
*** 31,35 ****
* It provides a range, a modifier (AND [+] or AND NOT [-]).
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
--- 31,35 ----
* It provides a range, a modifier (AND [+] or AND NOT [-]).
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Index: IndexSearcher.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/IndexSearcher.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IndexSearcher.java 10 May 2005 02:39:22 -0000 1.3
--- IndexSearcher.java 17 May 2005 00:43:16 -0000 1.4
***************
*** 46,50 ****
* <li>The ability to add soundslike type extensions.</ul>
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 46,50 ----
* <li>The ability to add soundslike type extensions.</ul>
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: AbstractBinaryQuery.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/AbstractBinaryQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractBinaryQuery.java 10 May 2005 02:39:22 -0000 1.3
--- AbstractBinaryQuery.java 17 May 2005 00:43:16 -0000 1.4
***************
*** 25,29 ****
* A binary token has a left token and right token.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
--- 25,29 ----
* A binary token has a left token and right token.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Index: Msg.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/Msg.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Msg.java 10 May 2005 02:39:22 -0000 1.15
--- Msg.java 17 May 2005 00:43:16 -0000 1.16
***************
*** 27,35 ****
* Compile safe Msg resource settings.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! class Msg extends MsgBase
{
static final Msg TYPE_INDEXGEN = new Msg("LuceneIndexManager.TypeIndexGen"); //$NON-NLS-1$
--- 27,35 ----
* Compile safe Msg resource settings.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! final class Msg extends MsgBase
{
static final Msg TYPE_INDEXGEN = new Msg("LuceneIndexManager.TypeIndexGen"); //$NON-NLS-1$
Index: LuceneIndex.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/LuceneIndex.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** LuceneIndex.java 10 May 2005 02:39:22 -0000 1.21
--- LuceneIndex.java 17 May 2005 00:43:16 -0000 1.22
***************
*** 67,71 ****
* Implement the SearchEngine using Lucene as the search engine.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 67,71 ----
* Implement the SearchEngine using Lucene as the search engine.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: OrQuery.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/OrQuery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** OrQuery.java 10 May 2005 02:39:22 -0000 1.5
--- OrQuery.java 17 May 2005 00:43:16 -0000 1.6
***************
*** 29,33 ****
* An or token specifies that a result needs to be in either the left and the right token.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
--- 29,33 ----
* An or token specifies that a result needs to be in either the left and the right token.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Index: ExtendedLuceneSyntax.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/ExtendedLuceneSyntax.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ExtendedLuceneSyntax.java 10 May 2005 02:39:22 -0000 1.5
--- ExtendedLuceneSyntax.java 17 May 2005 00:43:16 -0000 1.6
***************
*** 29,33 ****
* with passage ranges and with blurring (searching in nearby verses).
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
--- 29,33 ----
* with passage ranges and with blurring (searching in nearby verses).
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Index: BaseQuery.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/BaseQuery.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BaseQuery.java 10 May 2005 02:39:22 -0000 1.4
--- BaseQuery.java 17 May 2005 00:43:16 -0000 1.5
***************
*** 29,33 ****
* A base token is the smallest unit of search that the index can perform.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
--- 29,33 ----
* A base token is the smallest unit of search that the index can perform.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Index: LuceneIndexManager.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/LuceneIndexManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** LuceneIndexManager.java 10 May 2005 02:39:22 -0000 1.11
--- LuceneIndexManager.java 17 May 2005 00:43:16 -0000 1.12
***************
*** 44,48 ****
* An implementation of IndexManager for Lucene indexes.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 44,48 ----
* An implementation of IndexManager for Lucene indexes.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: AndNotQuery.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/AndNotQuery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AndNotQuery.java 10 May 2005 02:39:22 -0000 1.5
--- AndNotQuery.java 17 May 2005 00:43:16 -0000 1.6
***************
*** 30,34 ****
* but not in the right token.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
--- 30,34 ----
* but not in the right token.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Index: Query.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/Query.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Query.java 10 May 2005 02:39:22 -0000 1.4
--- Query.java 17 May 2005 00:43:16 -0000 1.5
***************
*** 29,33 ****
* The search.Searcher uses a List of Tokens to calculate a search.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
--- 29,33 ----
* The search.Searcher uses a List of Tokens to calculate a search.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
***************
*** 35,38 ****
public interface Query
{
! public Key find(Index index) throws BookException;
}
--- 35,38 ----
public interface Query
{
! Key find(Index index) throws BookException;
}
Index: AndQuery.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/AndQuery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AndQuery.java 10 May 2005 02:39:22 -0000 1.5
--- AndQuery.java 17 May 2005 00:43:16 -0000 1.6
***************
*** 29,33 ****
* An and token specifies that a result needs to be in both the left and the right token.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
--- 29,33 ----
* An and token specifies that a result needs to be in both the left and the right token.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Index: BlurQuery.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/BlurQuery.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BlurQuery.java 10 May 2005 02:39:22 -0000 1.5
--- BlurQuery.java 17 May 2005 00:43:16 -0000 1.6
***************
*** 30,34 ****
* A blur token specifies much to blur the results of the right token.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
--- 30,34 ----
* A blur token specifies much to blur the results of the right token.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Index: QueryBuilder.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/QueryBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** QueryBuilder.java 10 May 2005 02:39:22 -0000 1.5
--- QueryBuilder.java 17 May 2005 00:43:16 -0000 1.6
***************
*** 34,42 ****
* but ~n means to blur by n verses.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
! public class QueryBuilder
{
/**
--- 34,42 ----
* but ~n means to blur by n verses.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
! public final class QueryBuilder
{
/**
***************
*** 49,57 ****
/**
* Tokenize a query into a list of Tokens.
! * @param sought The text to parse
* @return A List of selected Tokens
*/
! public static List tokenize(String sought)
{
List output = new ArrayList();
if (sought == null || sought.length() == 0)
--- 49,58 ----
/**
* Tokenize a query into a list of Tokens.
! * @param aSearch The text to parse
* @return A List of selected Tokens
*/
! public static List tokenize(String aSearch)
{
+ String sought = aSearch;
List output = new ArrayList();
if (sought == null || sought.length() == 0)
More information about the jsword-svn
mailing list