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

[jswordcvs at crosswire.org]

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

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

Index: RawBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/raw/RawBook.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RawBook.java	25 Aug 2004 22:54:37 -0000	1.6
--- RawBook.java	29 Sep 2004 22:21:23 -0000	1.7
***************
*** 22,27 ****
  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.SearchEngine;
  import org.crosswire.jsword.passage.BibleInfo;
  import org.crosswire.jsword.passage.Key;
--- 22,25 ----
***************
*** 209,213 ****
   * @version $Id$
   */
! public class RawBook extends PassageAbstractBook implements Index
  {
      /**
--- 207,211 ----
   * @version $Id$
   */
! public class RawBook extends PassageAbstractBook
  {
      /**
***************
*** 272,277 ****
              log.error("Failed to load indexes.", ex); //$NON-NLS-1$
          }
- 
-         initSearchEngine();
      }
  
--- 270,273 ----
***************
*** 649,657 ****
  
      /**
-      * The search implementation
-      */
-     protected SearchEngine searcher;
- 
-     /**
       * Are we cacheing or in on disk mode?.
       * Does this Bible cache everything in
--- 645,648 ----