[jsword-svn] jsword/java/limbo/org/crosswire/jsword/book/jdbc s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/jdbc
In directory www.crosswire.org:/tmp/cvs-serv8429/java/limbo/org/crosswire/jsword/book/jdbc

Modified Files:
	JDBCBook.java 
Log Message:
Fixes for [JS-7] and [JS-6]
Lots of search work and re-factoring

Index: JDBCBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/jdbc/JDBCBook.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JDBCBook.java	10 Aug 2004 22:26:39 -0000	1.5
--- JDBCBook.java	29 Sep 2004 22:21:24 -0000	1.6
***************
*** 20,31 ****
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.book.BookMetaData;
- import org.crosswire.jsword.book.Search;
  import org.crosswire.jsword.book.basic.DefaultBookMetaData;
  import org.crosswire.jsword.book.basic.PassageAbstractBook;
  import org.crosswire.jsword.book.filter.Filter;
  import org.crosswire.jsword.book.filter.FilterFactory;
- import org.crosswire.jsword.book.search.Index;
- import org.crosswire.jsword.book.search.Parser;
- import org.crosswire.jsword.book.search.ParserFactory;
  import org.crosswire.jsword.passage.Key;
  import org.crosswire.jsword.passage.KeyUtil;
--- 20,27 ----
***************
*** 57,61 ****
   * @version $Id$
   */
! public class JDBCBook extends PassageAbstractBook implements Index
  {
      /**
--- 53,57 ----
   * @version $Id$
   */
! public class JDBCBook extends PassageAbstractBook
  {
      /**
***************
*** 125,130 ****
              throw new BookException(Msg.BIBLE_CONNECT, ex);
          }
- 
-         initSearchEngine();
      }
  
--- 121,124 ----
***************
*** 192,211 ****
  
      /* (non-Javadoc)
-      * @see org.crosswire.jsword.book.Book#find(org.crosswire.jsword.book.Search)
-      */
-     public Key find(Search search) throws BookException
-     {
-         try
-         {
-             Parser parser = ParserFactory.createParser(this);
-             return parser.search(search);
-         }
-         catch (InstantiationException ex)
-         {
-             throw new BookException(Msg.SEARCH_FAIL, ex);
-         }
-     }
- 
-     /* (non-Javadoc)
       * @see org.crosswire.jsword.book.search.Index#findWord(java.lang.String)
       */
--- 186,189 ----