Mailing Lists

--- 160,164 ----

! Preamble
  All java source should have the following at the end of the class JavaDoc
  ***************
*** 191,195 ****

! Similarity beween Java Sword API and C++ Sword API

    The core Java API is similar in that there are concepts like Key, Verse etc
--- 203,207 ----

! Similarity beween Java Sword API and C++ Sword API

    The core Java API is similar in that there are concepts like Key, Verse etc

From jswordcvs at crosswire.org  Sun Sep 26 02:46:37 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Sun Sep 26 02:46:38 2004
Subject: [jsword-svn] bibledesktop/resource s
Message-ID: <200409260946.i8Q9kbYR032243@www.crosswire.org>

Update of /cvs/jsword/bibledesktop/resource
In directory www.crosswire.org:/tmp/cvs-serv32239/resource

Modified Files:
	config.xml 
Log Message:
Put configurable stylesheet option back in

Index: config.xml
===================================================================
RCS file: /cvs/jsword/bibledesktop/resource/config.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** config.xml	8 Sep 2004 19:57:58 -0000	1.11
--- config.xml	26 Sep 2004 09:46:34 -0000	1.12
***************
*** 55,58 ****
--- 55,59 ----

+ -->

- -->

           New Testament

            Old Testament

          th

          td

      cell

              [< Previous]

              [Next >]

--- NEW FILE: cutandpaste2.xsl ---

      ,0,16

     font-weight: bold;

     font-style: italic;

        chapter

        x-lexeme

        x-lemma

        x-tag

        FIXME

           New Testament

            Old Testament

          th

          td

      cell

              [< Previous]

              [Next >]

Index: index.txt
===================================================================
RCS file: /cvs/jsword/bibledesktop/resource/xsl/cswing/index.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** index.txt	28 Apr 2004 23:34:38 -0000	1.1
--- index.txt	26 Sep 2004 10:14:35 -0000	1.2
***************
*** 1 ****
--- 1,3 ----
  simple.xsl
+ cutandpaste.xsl
+ cutandpaste2.xsl

From jswordcvs at crosswire.org  Sun Sep 26 03:55:31 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Sun Sep 26 03:55:32 2004
Subject: [jsword-svn] bibledesktop-web/etc/images s
Message-ID: <200409261055.i8QAtVWj032720@www.crosswire.org>

Update of /cvs/jsword/bibledesktop-web/etc/images
In directory www.crosswire.org:/tmp/cvs-serv32714/etc/images

Modified Files:
	bd-weblogo.xar 
Log Message:
new mailing lists

Index: bd-weblogo.xar
===================================================================
RCS file: /cvs/jsword/bibledesktop-web/etc/images/bd-weblogo.xar,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsvS4s4X and /tmp/cvsYpKEFl differ

From jswordcvs at crosswire.org  Sun Sep 26 03:55:31 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Sun Sep 26 03:55:32 2004
Subject: [jsword-svn] bibledesktop-web/web  s
Message-ID: <200409261055.i8QAtVMA032727@www.crosswire.org>

Update of /cvs/jsword/bibledesktop-web/web
In directory www.crosswire.org:/tmp/cvs-serv32714/web

Modified Files:
	template.xsl 
Added Files:
	maillists.html 
Log Message:
new mailing lists

Index: template.xsl
===================================================================
RCS file: /cvs/jsword/bibledesktop-web/web/template.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** template.xsl	31 Aug 2004 08:33:37 -0000	1.6
--- template.xsl	26 Sep 2004 10:55:29 -0000	1.7
***************
*** 78,81 ****
--- 78,82 ----
          writeLink("side", "screenshot.html", "Screenshots");
          writeLink("side", "howto.html", "How-To");
+         writeLink("side", "maillists.html", "Mailing-Lists");
          ]]>

***************
*** 88,92 ****

!         

            Stay informed:

--- 89,93 ----

!         

            Stay informed:

--- NEW FILE: maillists.html ---

 Bible Desktop - Getting Involved

Mailing Lists

  There are a number of Bible Desktop / J-Sword related mailing lists hosted at
  Crosswire. Mail to all of them is restricted to subscribers to reduce spam.

    Name
    Description
    List Address
(subscribers only)

      bibledesktop-announce

      [Subscribe]
      [Archives]

    A low volume list where significant updates to Bible Desktop are announced.

      bibledesktop-announce at crosswire dot org

      bibledesktop-users

      [Subscribe]
      [Archives]

    A medium volume list to allow users to discuss usage of Bible Desktop.

      bibledesktop-users at crosswire dot org

      jsword-devel

      [Subscribe]
      [Archives]

    A medium volume list for discussion amongst the various J-Sword project developers.

      jsword-devel at crosswire dot org

From jswordcvs at crosswire.org  Sun Sep 26 03:55:54 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Sun Sep 26 03:55:55 2004
Subject: [jsword-svn] jsword-web/web  s
Message-ID: <200409261055.i8QAtspj032766@www.crosswire.org>

Update of /cvs/jsword/jsword-web/web
In directory www.crosswire.org:/tmp/cvs-serv32762/web

Modified Files:
	template.xsl maillists.html 
Log Message:
new mailing lists

Index: template.xsl
===================================================================
RCS file: /cvs/jsword/jsword-web/web/template.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** template.xsl	26 Aug 2004 21:48:21 -0000	1.5
--- template.xsl	26 Sep 2004 10:55:52 -0000	1.6
***************
*** 93,96 ****
--- 93,97 ----
              CVS
              Mailing Lists
+             Bug Tracking

            Documentation

Index: maillists.html
===================================================================
RCS file: /cvs/jsword/jsword-web/web/maillists.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** maillists.html	19 Aug 2004 16:17:06 -0000	1.2
--- maillists.html	26 Sep 2004 10:55:52 -0000	1.3
***************
*** 2,6 ****

!  JSword - Getting Involved

--- 2,6 ----

!  J-Sword - Getting Involved

***************
*** 9,18 ****

!   There is a mailing list at jsword-devel@crosswire.org.
!   To join, please fill out your email address in on
!   this
!   form. Or you can read the archives here

--- 9,68 ----

!   There are a number of J-Sword / Bible Desktop related mailing lists hosted at
!   Crosswire. Mail to all of them is restricted to subscribers to reduce spam.

+ 
+   
+     
+     
+     
+   
+   
+     
+     
+     
+   
+   
+     
+     
+     
+   
+   
+     
+     
+     
+   
+   
+     
+     
+     
+   
+ Name Description List Address
(subscribers only)

+       bibledesktop-announce

+       [Subscribe]
+       [Archives]
+     A low volume list where significant updates to Bible Desktop are announced. 
+       bibledesktop-announce at crosswire dot org
+     

+       bibledesktop-users

+       [Subscribe]
+       [Archives]
+     A medium volume list to allow users to discuss usage of Bible Desktop. 
+       bibledesktop-users at crosswire dot org
+     

+       jsword-devel

+       [Subscribe]
+       [Archives]
+     A medium volume list for discussion amongst the various J-Sword project developers. 
+       jsword-devel at crosswire dot org
+     

+       jsword-svn

+       [Subscribe]
+       [Archives]
+     An automated list to which CVS/SVN changes are sent. We currently us CVS but will probably migrate soon 
+       jsword-svn at crosswire dot org
+     
+ 

From jswordcvs at crosswire.org  Tue Sep 28 15:25:05 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Tue Sep 28 15:25:07 2004
Subject: [jsword-svn] common/java/core/org/crosswire/common/util s
Message-ID: <200409282225.i8SMP5JO014642@www.crosswire.org>

Update of /cvs/jsword/common/java/core/org/crosswire/common/util
In directory www.crosswire.org:/tmp/cvs-serv14638/java/core/org/crosswire/common/util

Modified Files:
	NetUtil.java 
Log Message:
User confirmation of download

Index: NetUtil.java
===================================================================
RCS file: /cvs/jsword/common/java/core/org/crosswire/common/util/NetUtil.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NetUtil.java	21 Sep 2004 17:45:47 -0000	1.10
--- NetUtil.java	28 Sep 2004 22:25:03 -0000	1.11
***************
*** 11,14 ****
--- 11,15 ----
  import java.net.MalformedURLException;
  import java.net.URL;
+ import java.net.URLConnection;
  import java.util.ArrayList;
  import java.util.Arrays;
***************
*** 501,504 ****
--- 502,523 ----

      /**
+      * @param url the resource whose size is wanted
+      * @return the size of that resource
+      */
+     public static int getSize(URL url)
+     {
+         try
+         {
+             URLConnection urlConnection = url.openConnection();
+             int size = urlConnection.getContentLength();
+             return size;
+         }
+         catch (IOException e)
+         {
+             return 0;
+         }
+     }
+ 
+     /**
       * When was the given URL last modified. If no modification time is
       * available then this method return the current time.

From jswordcvs at crosswire.org  Tue Sep 28 15:25:08 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Tue Sep 28 15:25:10 2004
Subject: [jsword-svn] 
	bibledesktop/java/main/org/crosswire/bibledesktop/book s
Message-ID: <200409282225.i8SMP8vf014666@www.crosswire.org>

Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book
In directory www.crosswire.org:/tmp/cvs-serv14651/java/main/org/crosswire/bibledesktop/book

Modified Files:
	Msg.properties Msg.java SitePane.java 
Log Message:
User confirmation of download

Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/Msg.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msg.properties	8 Sep 2004 19:57:58 -0000	1.4
--- Msg.properties	28 Sep 2004 22:25:06 -0000	1.5
***************
*** 28,31 ****
--- 28,35 ----
  SitesPane.Local=Installed Books

+ SitePane.Size={0} is {1,number,###,###,###.#}KB. Continue?
+ SitePane.ConfirmationTitle=Download Book
+ SitePane.Installed=Book already installed: {0}
+ 
  EditSitePane.EditSitesTitle=Edit Update Sites
  EditSitePane.MissingSite=Missing site name

Index: SitePane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/SitePane.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SitePane.java	21 Sep 2004 17:46:47 -0000	1.9
--- SitePane.java	28 Sep 2004 22:25:06 -0000	1.10
***************
*** 7,10 ****
--- 7,11 ----
  import javax.swing.JButton;
  import javax.swing.JLabel;
+ import javax.swing.JOptionPane;
  import javax.swing.JPanel;
  import javax.swing.JScrollPane;
***************
*** 21,24 ****
--- 22,26 ----
  import org.crosswire.common.swing.MapTable;
  import org.crosswire.common.swing.MapTableModel;
+ import org.crosswire.common.util.NetUtil;
  import org.crosswire.common.util.Reporter;
  import org.crosswire.jsword.book.BookList;
***************
*** 236,240 ****
                  try
                  {
!                     installer.install(name);
                  }
                  catch (InstallException ex)
--- 238,256 ----
                  try
                  {
!                     // Is the book already installed? Then nothing to do.
!                     if (Books.installed().getBookMetaData(name.getName()) != null)
!                     {
!                         Reporter.informUser(this, Msg.INSTALLED, name.getName());
!                         return;
!                     }
! 
!                     float size = NetUtil.getSize(installer.toURL(name)) / 1024;
!                     if (JOptionPane.showConfirmDialog(this, Msg.SIZE.toString(new Object[] {name.getName(), new Float(size)}),
!                                     Msg.CONFIRMATION_TITLE.toString(),
!                                     JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION)
!                     {
!                         installer.install(name);
!                     }
! 
                  }
                  catch (InstallException ex)

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/Msg.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Msg.java	8 Sep 2004 19:57:58 -0000	1.6
--- Msg.java	28 Sep 2004 22:25:06 -0000	1.7
***************
*** 52,55 ****
--- 52,59 ----
      static final Msg LOCAL_BOOKS = new Msg("SitesPane.Local"); //$NON-NLS-1$

+     static final Msg SIZE = new Msg("SitePane.Size"); //$NON-NLS-1$
+     static final Msg CONFIRMATION_TITLE = new Msg("SitePane.ConfirmationTitle"); //$NON-NLS-1$
+     static final Msg INSTALLED = new Msg("SitePane.Installed"); //$NON-NLS-1$
+ 
      static final Msg EDIT_SITE_TITLE = new Msg("EditSitePane.EditSitesTitle"); //$NON-NLS-1$
      static final Msg MISSING_SITE = new Msg("EditSitePane.MissingSite"); //$NON-NLS-1$

From jswordcvs at crosswire.org  Tue Sep 28 15:25:12 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Tue Sep 28 15:25:13 2004
Subject: [jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/install s
Message-ID: <200409282225.i8SMPCQZ014693@www.crosswire.org>

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install
In directory www.crosswire.org:/tmp/cvs-serv14678/java/jsword/org/crosswire/jsword/book/install

Modified Files:
	Installer.java 
Log Message:
User confirmation of download

Index: Installer.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/Installer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Installer.java	8 Feb 2004 23:03:23 -0000	1.4
--- Installer.java	28 Sep 2004 22:25:10 -0000	1.5
***************
*** 1,4 ****
--- 1,5 ----
  package org.crosswire.jsword.book.install;

+ import java.net.URL;
  import java.util.List;

***************
*** 68,70 ****
--- 69,77 ----
       */
      public void install(BookMetaData bmd) throws InstallException;
+ 
+     /**
+      * @param bmd
+      * @return the url for the BookMetaData
+      */
+     public URL toURL(BookMetaData bmd);
  }

From jswordcvs at crosswire.org  Tue Sep 28 15:25:12 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Tue Sep 28 15:25:14 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/install/sword s
Message-ID: <200409282225.i8SMPChd014699@www.crosswire.org>

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword
In directory www.crosswire.org:/tmp/cvs-serv14678/java/jsword/org/crosswire/jsword/book/install/sword

Modified Files:
	HttpSwordInstaller.java FtpSwordInstaller.java 
Log Message:
User confirmation of download

Index: HttpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HttpSwordInstaller.java	21 Sep 2004 17:46:23 -0000	1.6
--- HttpSwordInstaller.java	28 Sep 2004 22:25:10 -0000	1.7
***************
*** 9,12 ****
--- 9,13 ----
  import java.io.OutputStream;
  import java.io.Reader;
+ import java.net.MalformedURLException;
  import java.net.URL;
  import java.net.URLConnection;
***************
*** 189,193 ****
              out = new FileOutputStream(f);
              URLConnection urlConnection = zipurl.openConnection();
-             log.debug("The file size is " + urlConnection.getContentLength()); //$NON-NLS-1$
              in = urlConnection.getInputStream();
              byte[] buf = new byte[4096];
--- 190,193 ----
***************
*** 197,201 ****
              }
              // unpack the zip.
-             log.debug("The file is downlaoded!"); //$NON-NLS-1$
              ZipFile zf = new ZipFile(f);
              Enumeration entries = zf.entries();
--- 197,200 ----
***************
*** 204,208 ****
                  ZipEntry entry = (ZipEntry) entries.nextElement();
                  String entrypath = entry.getName();
-                 log.debug("entry is called " + entrypath); //$NON-NLS-1$
                  String filename = entrypath.substring(entrypath.lastIndexOf('/') + 1);
                  URL child = NetUtil.lengthenURL(destdir, filename);
--- 203,206 ----
***************
*** 261,265 ****
          if (Books.installed().getBookMetaData(bmd.getName()) != null)
          {
-             Reporter.informUser(this, Msg.INSTALLED, bmd.getName());
              return;
          }
--- 259,262 ----
***************
*** 267,272 ****
          final SwordBookMetaData sbmd = (SwordBookMetaData) bmd;

-         Reporter.informUser(this, Msg.INSTALLING, sbmd.getName());
- 
          // So now we know what we want to install - all we need to do
          // is installer.install(name) however we are doing it in the
--- 264,267 ----
***************
*** 302,308 ****

                      SwordBookDriver.registerNewBook(sbmd, dldir);
- 
-                     // inform the user that we are done
-                     Reporter.informUser(this, Msg.INSTALL_DONE, sbmd.getName());
                  }
                  catch (Exception ex)
--- 297,300 ----
***************
*** 323,326 ****
--- 315,338 ----
      }

+     public URL toURL(BookMetaData bmd)
+     {
+         if (!(bmd instanceof SwordBookMetaData))
+         {
+             assert false;
+             return null;
+         }
+ 
+         SwordBookMetaData sbmd = (SwordBookMetaData) bmd;
+ 
+ 	    try
+         {
+             return new URL("http://" + host + directory + '/' + PACKAGE_DIR + '/' + sbmd.getInitials() + ZIP_SUFFIX); //$NON-NLS-1$
+         }
+         catch (MalformedURLException e)
+         {
+             return null;
+         }
+ 	}
+ 
      /* (non-Javadoc)
       * @see java.lang.Comparable#compareTo(java.lang.Object)

Index: FtpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FtpSwordInstaller.java	21 Sep 2004 17:46:23 -0000	1.3
--- FtpSwordInstaller.java	28 Sep 2004 22:25:10 -0000	1.4
***************
*** 8,11 ****
--- 8,12 ----
  import java.io.OutputStream;
  import java.io.Reader;
+ import java.net.MalformedURLException;
  import java.net.URL;
  import java.util.ArrayList;
***************
*** 88,91 ****
--- 89,112 ----
      }

+     public URL toURL(BookMetaData bmd)
+     {
+         if (!(bmd instanceof SwordBookMetaData))
+         {
+             assert false;
+             return null;
+         }
+ 
+         SwordBookMetaData sbmd = (SwordBookMetaData) bmd;
+ 
+ 	    try
+         {
+             return new URL("ftp://ftp.crosswire.org/pub/sword/packages/rawzip/" + sbmd.getInitials() + ZIP_SUFFIX); //$NON-NLS-1$
+         }
+         catch (MalformedURLException e)
+         {
+             return null;
+         }
+ 	}
+ 
      /* (non-Javadoc)
       * @see org.crosswire.jsword.book.install.Installer#install(java.lang.String)
***************
*** 102,106 ****
          if (Books.installed().getBookMetaData(bmd.getName()) != null)
          {
-             Reporter.informUser(this, Msg.INSTALLED, bmd.getName());
              return;
          }
--- 123,126 ----
***************
*** 108,113 ****
          final SwordBookMetaData sbmd = (SwordBookMetaData) bmd;

-         Reporter.informUser(this, Msg.INSTALLING, sbmd.getName());
- 
          // So now we know what we want to install - all we need to do
          // is installer.install(name) however we are doing it in the
--- 128,131 ----
***************
*** 146,152 ****

                      SwordBookDriver.registerNewBook(sbmd, dldir);
- 
-                     // inform the user that we are done
-                     Reporter.informUser(this, Msg.INSTALL_DONE, sbmd.getName());
                  }
                  catch (Exception ex)
--- 164,167 ----
***************
*** 663,665 ****
--- 678,685 ----
       */
      private static final Logger log = Logger.getLogger(FtpSwordInstaller.class);
+ 
+     /**
+      * The suffix of zip modules on this server
+      */
+     private static final String ZIP_SUFFIX = ".zip"; //$NON-NLS-1$
  }

From jswordcvs at crosswire.org  Wed Sep 29 14:52:01 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 14:52:01 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/search/index -
	New directorys
Message-ID: <200409292152.i8TLq1w2008036@www.crosswire.org>

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/index
In directory www.crosswire.org:/tmp/cvs-serv8024/java/jsword/org/crosswire/jsword/book/search/index

Log Message:
Directory /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/index added to the repository

From jswordcvs at crosswire.org  Wed Sep 29 14:52:00 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 14:52:02 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/search/basic -
	New directorys
Message-ID: <200409292152.i8TLq0nQ008030@www.crosswire.org>

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/basic
In directory www.crosswire.org:/tmp/cvs-serv8024/java/jsword/org/crosswire/jsword/book/search/basic

Log Message:
Directory /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/basic added to the repository

From jswordcvs at crosswire.org  Wed Sep 29 14:53:35 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 14:53:36 2004
Subject: [jsword-svn] 
	bibledesktop/java/limbo/org/crosswire/bibledesktop/desktop s
Message-ID: <200409292153.i8TLrZ5K008102@www.crosswire.org>

Update of /cvs/jsword/bibledesktop/java/limbo/org/crosswire/bibledesktop/desktop
In directory www.crosswire.org:/tmp/cvs-serv8097/java/limbo/org/crosswire/bibledesktop/desktop

Modified Files:
	CompareResultsPane.java 
Log Message:
search refactoring

Index: CompareResultsPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/limbo/org/crosswire/bibledesktop/desktop/CompareResultsPane.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CompareResultsPane.java	27 Jul 2004 21:41:33 -0000	1.1
--- CompareResultsPane.java	29 Sep 2004 21:53:33 -0000	1.2
***************
*** 233,241 ****
              JobManager.addWorkListener(cpl);

-             if (checkText != null && checkText.equals("") && alive) //$NON-NLS-1$
-             {
-                 ver.checkPassage(checkText, out);
-             }
- 
              if (checkRef != null && checkRef.isEmpty() && alive)
              {
--- 233,236 ----

From jswordcvs at crosswire.org  Wed Sep 29 15:15:09 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:15:10 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/install/sword s
Message-ID: <200409292215.i8TMF9rQ008267@www.crosswire.org>

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword
In directory www.crosswire.org:/tmp/cvs-serv8263/java/jsword/org/crosswire/jsword/book/install/sword

Modified Files:
	HttpSwordInstaller.java FtpSwordInstaller.java 
Log Message:
fixed a hardcoding bug in ftpinstaller and added some javadocs

Index: HttpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/HttpSwordInstaller.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HttpSwordInstaller.java	28 Sep 2004 22:25:10 -0000	1.7
--- HttpSwordInstaller.java	29 Sep 2004 22:15:07 -0000	1.8
***************
*** 315,318 ****
--- 315,321 ----
      }

+     /* (non-Javadoc)
+      * @see org.crosswire.jsword.book.install.Installer#toURL(org.crosswire.jsword.book.BookMetaData)
+      */
      public URL toURL(BookMetaData bmd)
      {

Index: FtpSwordInstaller.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/install/sword/FtpSwordInstaller.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FtpSwordInstaller.java	28 Sep 2004 22:25:10 -0000	1.4
--- FtpSwordInstaller.java	29 Sep 2004 22:15:07 -0000	1.5
***************
*** 89,92 ****
--- 89,95 ----
      }

+     /* (non-Javadoc)
+      * @see org.crosswire.jsword.book.install.Installer#toURL(org.crosswire.jsword.book.BookMetaData)
+      */
      public URL toURL(BookMetaData bmd)
      {
***************
*** 101,107 ****
  	    try
          {
!             return new URL("ftp://ftp.crosswire.org/pub/sword/packages/rawzip/" + sbmd.getInitials() + ZIP_SUFFIX); //$NON-NLS-1$
          }
!         catch (MalformedURLException e)
          {
              return null;
--- 104,110 ----
  	    try
          {
!             return new URL(NetUtil.PROTOCOL_FTP + "://" + host + directory + "/" + sbmd.getInitials() + ZIP_SUFFIX); //$NON-NLS-1$ //$NON-NLS-2$
          }
!         catch (MalformedURLException ex)
          {
              return null;

From jswordcvs at crosswire.org  Wed Sep 29 15:15:32 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:15:33 2004
Subject: [jsword-svn] common/java/core/org/crosswire/common/util s
Message-ID: <200409292215.i8TMFWvn008288@www.crosswire.org>

Update of /cvs/jsword/common/java/core/org/crosswire/common/util
In directory www.crosswire.org:/tmp/cvs-serv8284/java/core/org/crosswire/common/util

Modified Files:
	NetUtil.java 
Log Message:
new protocol constants

Index: NetUtil.java
===================================================================
RCS file: /cvs/jsword/common/java/core/org/crosswire/common/util/NetUtil.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NetUtil.java	28 Sep 2004 22:25:03 -0000	1.11
--- NetUtil.java	29 Sep 2004 22:15:30 -0000	1.12
***************
*** 58,61 ****
--- 58,71 ----

      /**
+      * Constant for the file: protocol
+      */
+     public static final String PROTOCOL_HTTP = "http"; //$NON-NLS-1$
+ 
+     /**
+      * Constant for the file: protocol
+      */
+     public static final String PROTOCOL_FTP = "ftp"; //$NON-NLS-1$
+ 
+     /**
       * Constant for the jar: protocol
       */

From jswordcvs at crosswire.org  Wed Sep 29 15:15:48 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:15:50 2004
Subject: [jsword-svn] bibledesktop/etc/eclipse  s
Message-ID: <200409292215.i8TMFmUN008311@www.crosswire.org>

Update of /cvs/jsword/bibledesktop/etc/eclipse
In directory www.crosswire.org:/tmp/cvs-serv8307/etc/eclipse

Modified Files:
	bibledesktop-app-desktop15.launch 
Added Files:
	localexec.bat 
Log Message:
launch debugs

--- NEW FILE: localexec.bat ---

REM STEP 1 - Initial setup
REM @echo off
if "%OS%"=="Windows_NT" @setlocal

REM STEP 2 - Check we know where we are installed
set DEFAULT_JSWORD=%~dp0
if "%JSWORD%"=="" set JSWORD=%DEFAULT_JSWORD%
set DEFAULT_JSWORD=
if exist "%JSWORD%" goto DoneFindJSword
REM have a blind guess ...
if not exist "C:\Progra~1\JSword" goto FailedFindJSword
set JSWORD=C:\Progra~1\JSword
:DoneFindJSword
echo "Using JSWORD=%JSWORD%"

REM STEP 3 - Setup the classpath
set LOCALCLASSPATH=%CLASSPATH%
for %%i in ("%JSWORD%\*.jar") do call "%JSWORD%\lcp.bat" %%i

REM STEP 4 - Run JSword
REM -Xmx256M
REM "-Djava.endorsed.dirs=%JSWORD%\lib"
REM -classpath "%JSWORD%\resource"
"%JAVA_HOME%\bin\java.exe" -classpath "%LOCALCLASSPATH%" org.crosswire.bibledesktop.desktop.Desktop
goto End

:FailedFindJSword
echo "Can't find install directory. Please use C:\Progra~1\JSword or set the JSWORD variable"

:End
set LOCALCLASSPATH=
set _JAVACMD=
if "%OS%"=="Windows_NT" @endlocal

Index: bibledesktop-app-desktop15.launch
===================================================================
RCS file: /cvs/jsword/bibledesktop/etc/eclipse/bibledesktop-app-desktop15.launch,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bibledesktop-app-desktop15.launch	28 Apr 2004 23:34:38 -0000	1.3
--- bibledesktop-app-desktop15.launch	29 Sep 2004 22:15:46 -0000	1.4
***************
*** 3,7 ****

! 

--- 3,7 ----

! 

***************
*** 13,16 ****

- 

--- 13,15 ----

From jswordcvs at crosswire.org  Wed Sep 29 15:17:49 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:17:50 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/search/parse s
Message-ID: <200409292217.i8TMHnWi008336@www.crosswire.org>

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse
In directory www.crosswire.org:/tmp/cvs-serv8332/java/jsword/org/crosswire/jsword/book/search/parse

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

--- Grammar.java DELETED ---

From jswordcvs at crosswire.org  Wed Sep 29 15:20:47 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:20:49 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/search/parse s
Message-ID: <200409292220.i8TMKlZd008414@www.crosswire.org>

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse
In directory www.crosswire.org:/tmp/cvs-serv8404/java/jsword/org/crosswire/jsword/book/search/parse

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

--- LocalParser.java DELETED ---

From jswordcvs at crosswire.org  Wed Sep 29 15:21:25 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:27 2004
Subject: [jsword-svn] jsword/java/limbo/org/crosswire/jsword/book/stub  s
Message-ID: <200409292221.i8TMLPLN008486@www.crosswire.org>

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

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

Index: StubBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/stub/StubBook.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StubBook.java	10 Aug 2004 22:26:39 -0000	1.2
--- StubBook.java	29 Sep 2004 22:21:23 -0000	1.3
***************
*** 45,50 ****
          BookMetaData bmd = new DefaultBookMetaData(driver, this, name, type, speed);
          setBookMetaData(bmd);
- 
-         initSearchEngine();
      }

--- 45,48 ----

Index: StubDictionary.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/stub/StubDictionary.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StubDictionary.java	10 Aug 2004 22:26:39 -0000	1.5
--- StubDictionary.java	29 Sep 2004 22:21:23 -0000	1.6
***************
*** 50,55 ****
          BookMetaData bmd = new DefaultBookMetaData(driver, this, name, type, speed);
          setBookMetaData(bmd);
- 
-         initSearchEngine();
      }

--- 50,53 ----

From jswordcvs at crosswire.org  Wed Sep 29 15:21:25 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:28 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/search/basic s
Message-ID: <200409292221.i8TMLPXW008531@www.crosswire.org>

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

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

--- NEW FILE: NullThesaurus.java ---
package org.crosswire.jsword.book.search.basic;

import java.util.ArrayList;
import java.util.Collection;

import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.book.search.Thesaurus;

/**
 * An implementation of Thesaurus that simply returns the word that the user
 * wanted similies of.
 * Useful if there is no other source of similarity data.
 * 
 * 
 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: NullThesaurus.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public class NullThesaurus implements Thesaurus
{
    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.Thesaurus#getStartsWith(java.lang.String)
     */
    public Collection getSynonyms(String word) throws BookException
    {
        Collection reply = new ArrayList();
        reply.add(word);
        return reply;
    }
}

From jswordcvs at crosswire.org  Wed Sep 29 15:21:25 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:28 2004
Subject: [jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/readings s
Message-ID: <200409292221.i8TMLPj4008516@www.crosswire.org>

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

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

Index: ReadingsBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings/ReadingsBook.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ReadingsBook.java	8 Sep 2004 19:55:07 -0000	1.20
--- ReadingsBook.java	29 Sep 2004 22:21:23 -0000	1.21
***************
*** 67,72 ****
          setBookMetaData(bmd);

-         initSearchEngine();
- 
          String setname = ReadingsBookDriver.getReadingsSet();

--- 67,70 ----

From jswordcvs at crosswire.org  Wed Sep 29 15:21:25 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:28 2004
Subject: [jsword-svn] jsword/java/limbo/org/crosswire/jsword/book/raw s
Message-ID: <200409292221.i8TMLPEp008512@www.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 ----

From jswordcvs at crosswire.org  Wed Sep 29 15:21:25 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:28 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/search/ser s
Message-ID: <200409292221.i8TMLPo8008498@www.crosswire.org>

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

Modified Files:
	Msg.java Msg.properties 
Added Files:
	SerIndex.java 
Removed Files:
	SerSearchEngine.java 
Log Message:
Fixes for [JS-7] and [JS-6]
Lots of search work and re-factoring

--- SerSearchEngine.java DELETED ---

Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/ser/Msg.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Msg.properties	27 Jul 2004 21:42:38 -0000	1.2
--- Msg.properties	29 Sep 2004 22:21:23 -0000	1.3
***************
*** 6,14 ****
  # It should have no spaces or other punctuation (e.g. _, -, ', ...)

! SerSearchEngine.SearchFail=Could not start search engine
! SerSearchEngine.RepeatedReadError=Too many errors while reading data.
! SerSearchEngine.WriteError=Write Error.
! SerSearchEngine.FindingWords=Finding Words ({0})
! SerSearchEngine.WritingWords=Writing Words ({0})
! SerSearchEngine.Saving=Saving Index
! SerSearchEngine.Interrupted=Interrupted while creating index.
\ No newline at end of file
--- 6,13 ----
  # It should have no spaces or other punctuation (e.g. _, -, ', ...)

! SerIndex.RepeatedReadError=Too many errors while reading data.
! SerIndex.WriteError=Write Error.
! SerIndex.FindingWords=Finding Words ({0})
! SerIndex.WritingWords=Writing Words ({0})
! SerIndex.Saving=Saving Index
! SerIndex.Interrupted=Interrupted while creating index.
\ No newline at end of file

--- NEW FILE: SerIndex.java ---
package org.crosswire.jsword.book.search.ser;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.RandomAccessFile;
import java.net.URL;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;

import org.crosswire.common.activate.Activatable;
import org.crosswire.common.activate.Activator;
import org.crosswire.common.activate.Lock;
import org.crosswire.common.progress.Job;
import org.crosswire.common.util.FileUtil;
import org.crosswire.common.util.Logger;
import org.crosswire.common.util.NetUtil;
import org.crosswire.common.util.Reporter;
import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.book.BookData;
import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.book.SentanceUtil;
import org.crosswire.jsword.book.search.Index;
import org.crosswire.jsword.book.search.IndexManager;
import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.KeyUtil;
import org.crosswire.jsword.passage.NoSuchKeyException;
import org.crosswire.jsword.passage.Passage;
import org.crosswire.jsword.passage.PassageKeyFactory;
import org.crosswire.jsword.passage.Verse;
import org.crosswire.jsword.util.Project;

/**
 * A search engine - This is a stepping stone on the way to allowing use of
 * Lucene in place of our search engine.
 * 
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: SerIndex.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public class SerIndex implements Index, Activatable
{
    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.SearchEngine#init(org.crosswire.jsword.book.Bible, java.net.URL)
     */
    public void init(Book newbook) throws BookException
    {
        this.book = newbook;

        try
        {
            String driverName = book.getBookMetaData().getDriverName();
            String bookName = book.getBookMetaData().getInitials();

            assert driverName != null;
            assert bookName != null;

            url = Project.instance().getTempScratchSpace(driverName + "-" + bookName, false); //$NON-NLS-1$
        }
        catch (IOException ex)
        {
            throw new BookException(Msg.WRITE_ERROR);
        }
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.Index#getKey(java.lang.String)
     */
    public Key getKey(String name) throws NoSuchKeyException
    {
        return book.getKey(name);
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.SearchEngine#delete()
     */
    public void delete()
    {
        checkActive();

        // LATER(joe): write delete()
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.parse.Index#getStartsWith(java.lang.String)
     */
    public Collection getStartsWith(String word)
    {
        checkActive();

        word = word.toLowerCase();
        SortedMap submap = datamap.subMap(word, word + "\u9999"); //$NON-NLS-1$
        return submap.keySet();
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.parse.Index#findWord(java.lang.String)
     */
    public Key findWord(String word)
    {
        checkActive();

        if (word == null)
        {
            return book.createEmptyKeyList();
        }

        Section section = (Section) datamap.get(word.toLowerCase());
        if (section == null)
        {
            return book.createEmptyKeyList();
        }

        try
        {
            // Read blob
            byte[] blob = new byte[section.length];
            dataRaf.seek(section.offset);
            int read = dataRaf.read(blob);

            // Probably a bit harsh, but it would be wrong to just drop it.
            if (read != blob.length)
            {
                throw new IOException();
            }

            // De-serialize
            return PassageKeyFactory.fromBinaryRepresentation(blob);
        }
        catch (Exception ex)
        {
            log.warn("Search failed on:"); //$NON-NLS-1$
            log.warn("  word=" + word); //$NON-NLS-1$
            log.warn("  offset=" + section.offset); //$NON-NLS-1$
            log.warn("  length=" + section.length); //$NON-NLS-1$
            Reporter.informUser(this, ex);

            return book.createEmptyKeyList();
        }
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.AbstractIndex#isIndexed()
     */
    public boolean isIndexed()
    {
        if (generating)
        {
            return false;
        }

        URL indexIn = NetUtil.lengthenURL(url, FILE_INDEX);
        return NetUtil.isFile(indexIn);
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.AbstractIndex#generateSearchIndex(org.crosswire.common.progress.Job)
     */
    public void generateSearchIndex(Job job) throws BookException
    {
        // create a word/passage hashmap
        Map matchmap = new HashMap();
        generateSearchIndexImpl(job, book.getGlobalKeyList(), matchmap);

        // For the progress listener
        int count = 0;
        int words = matchmap.size();

        // Now we need to write the words into our index
        try
        {
            NetUtil.makeDirectory(url);
            URL dataUrl = NetUtil.lengthenURL(url, FILE_DATA);
            dataRaf = new RandomAccessFile(NetUtil.getAsFile(dataUrl), FileUtil.MODE_WRITE);
        }
        catch (IOException ex)
        {
            throw new BookException(Msg.WRITE_ERROR, ex);
        }

        for (Iterator it = matchmap.keySet().iterator(); it.hasNext(); )
        {
            String word = (String) it.next();
            Key match = (Key) matchmap.get(word);
            recordFoundPassage(word, match);

            // Fire a progress event?
            int percent = PERCENT_READ + (PERCENT_WRITE * count++ / words) / BibleInfo.versesInBible();
            job.setProgress(percent, Msg.WRITING_WORDS.toString(word));

            // This could take a long time ...
            Thread.yield();
            if (Thread.currentThread().isInterrupted())
            {
                break;
            }
        }

        // Store the indexes on disk
        try
        {
            job.setProgress(PERCENT_READ + PERCENT_WRITE, Msg.SAVING.toString());

            // Save the ascii Passage index
            URL indexurl = NetUtil.lengthenURL(url, FILE_INDEX);
            PrintWriter indexout = new PrintWriter(NetUtil.getOutputStream(indexurl));
            Iterator it = datamap.keySet().iterator();
            while (it.hasNext())
            {
                String word = (String) it.next();
                Section section = (Section) datamap.get(word);
                indexout.println(word + ":" + section.offset + ":" + section.length); //$NON-NLS-1$ //$NON-NLS-2$
            }
            indexout.close();
        }
        catch (IOException ex)
        {
            throw new BookException(Msg.WRITE_ERROR, ex);
        }
    }

    /**
     * Dig down into a Key indexing as we go.
     */
    private void generateSearchIndexImpl(Job job, Key key, Map matchmap) throws BookException
    {
        // loop through all the verses

        int percent = 0;
        for (Iterator it = key.iterator(); it.hasNext(); )
        {
            Key sublist = (Key) it.next();
            if (sublist.canHaveChildren())
            {
                generateSearchIndexImpl(job, sublist, matchmap);
            }
            else
            {
                BookData data = book.getData(sublist);
                String text = data.getPlainText();

                String[] words = SentanceUtil.getWords(text);
                for (int i = 0; i < words.length; i++)
                {
                    // ensure there is a Passage for this word in the word/passage hashmap
                    Key matches = (Key) matchmap.get(words[i]);
                    if (matches == null)
                    {
                        matches = book.createEmptyKeyList();
                        matchmap.put(words[i], matches);
                    }

                    // add this verse to this words passage
                    matches.addAll(sublist);
                }

                // report progress
                if (sublist instanceof Passage)
                {
                    Verse verse = KeyUtil.getVerse(sublist);
                    percent = PERCENT_READ * verse.getOrdinal() / BibleInfo.versesInBible();
                }

                job.setProgress(percent, Msg.FINDING_WORDS.toString(sublist.getName()));

                // This could take a long time ...
                Thread.yield();
                if (Thread.currentThread().isInterrupted())
                {
                    break;
                }
            }
        }
    }

    /**
     * Add to the main index data the references against this word
     * @param word The word to write
     * @param key The references to the word
     */
    private void recordFoundPassage(String word, Key key) throws BookException
    {
        if (word == null)
        {
            return;
        }

        try
        {
            Passage ref = KeyUtil.getPassage(key);
            byte[] buffer = PassageKeyFactory.toBinaryRepresentation(ref);

            Section section = new Section(dataRaf.getFilePointer(), buffer.length);

            dataRaf.write(buffer);
            datamap.put(word.toLowerCase(), section);
        }
        catch (Exception ex)
        {
            throw new BookException(Msg.WRITE_ERROR, ex);
        }
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.SearchEngine#activate()
     */
    public final void activate(Lock lock)
    {
        // Load the ascii Passage index
        if (isIndexed())
        {
            try
            {
                URL dataUrl = NetUtil.lengthenURL(url, FILE_DATA);
                dataRaf = new RandomAccessFile(NetUtil.getAsFile(dataUrl), FileUtil.MODE_READ);

                URL indexUrl = NetUtil.lengthenURL(url, FILE_INDEX);
                BufferedReader indexIn = new BufferedReader(new InputStreamReader(indexUrl.openStream()));

                while (true)
                {
                    String line = indexIn.readLine();
                    if (line == null)
                    {
                        break;
                    }

                    try
                    {
                        int colon1 = line.indexOf(":"); //$NON-NLS-1$
                        int colon2 = line.lastIndexOf(":"); //$NON-NLS-1$
                        String word = line.substring(0, colon1);

                        long offset = Long.parseLong(line.substring(colon1 + 1, colon2));
                        int length = Integer.parseInt(line.substring(colon2 + 1));

                        Section section = new Section(offset, length);
                        datamap.put(word, section);
                    }
                    catch (NumberFormatException ex)
                    {
                        log.error("NumberFormatException reading line: " + line, ex); //$NON-NLS-1$
                    }
                }
            }
            catch (IOException ex)
            {
                log.error("Read failed on indexin", ex); //$NON-NLS-1$
            }
        }
        else
        {
            IndexManager.instance().createIndex(this);
        }

        active = true;
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.SearchEngine#deactivate()
     */
    public final void deactivate(Lock lock)
    {
        datamap.clear();
        dataRaf = null;

        active = false;
    }

    /**
     * Helper method so we can quickly activate ourselves on access
     */
    private final void checkActive()
    {
        if (!active)
        {
            Activator.activate(this);
        }
    }

    /**
     * Are we active
     */
    private boolean active = false;

    /**
     * Are we in the middle of generating an index?
     */
    private boolean generating = false;

    /**
     * The name of the data file
     */
    private static final String FILE_DATA = "ref.data"; //$NON-NLS-1$

    /**
     * The name of the index file
     */
    private static final String FILE_INDEX = "ref.index"; //$NON-NLS-1$

    /**
     * The Bible we are indexing
     */
    protected Book book;

    /**
     * The directory to which to write the index
     */
    private URL url;

    /**
     * The passages random access file
     */
    private RandomAccessFile dataRaf;

    /**
     * The hash of indexes into the passages file
     */
    private SortedMap datamap = new TreeMap();

    /**
     * The log stream
     */
    private static final Logger log = Logger.getLogger(SerIndex.class);

    /**
     * The percentages taken but by different parts
     */
    private static final int PERCENT_READ = 60;
    private static final int PERCENT_WRITE = 39;
    // private static final int PERCENT_INDEX = 1;

    /**
     * A simple class to hold an offset and length into the passages random
     * access file
     */
    public static class Section
    {
        protected Section(long offset, int length)
        {
            this.offset = offset;
            this.length = length;
        }

        protected long offset;
        protected int length;
    }
}

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/ser/Msg.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Msg.java	27 Jul 2004 21:42:38 -0000	1.13
--- Msg.java	29 Sep 2004 22:21:23 -0000	1.14
***************
*** 29,39 ****
  class Msg extends MsgBase
  {
!     static final Msg SEARCH_FAIL = new Msg("SerSearchEngine.SearchFail"); //$NON-NLS-1$
!     static final Msg REPEATED_READ_ERROR = new Msg("SerSearchEngine.RepeatedReadError"); //$NON-NLS-1$
!     static final Msg WRITE_ERROR = new Msg("SerSearchEngine.WriteError"); //$NON-NLS-1$
!     static final Msg FINDING_WORDS = new Msg("SerSearchEngine.FindingWords"); //$NON-NLS-1$
!     static final Msg WRITING_WORDS = new Msg("SerSearchEngine.WritingWords"); //$NON-NLS-1$
!     static final Msg SAVING = new Msg("SerSearchEngine.Saving"); //$NON-NLS-1$
!     static final Msg INTERRUPTED = new Msg("SerSearchEngine.Interrupted"); //$NON-NLS-1$

      /**
--- 29,38 ----
  class Msg extends MsgBase
  {
!     static final Msg REPEATED_READ_ERROR = new Msg("SerIndex.RepeatedReadError"); //$NON-NLS-1$
!     static final Msg WRITE_ERROR = new Msg("SerIndex.WriteError"); //$NON-NLS-1$
!     static final Msg FINDING_WORDS = new Msg("SerIndex.FindingWords"); //$NON-NLS-1$
!     static final Msg WRITING_WORDS = new Msg("SerIndex.WritingWords"); //$NON-NLS-1$
!     static final Msg SAVING = new Msg("SerIndex.Saving"); //$NON-NLS-1$
!     static final Msg INTERRUPTED = new Msg("SerIndex.Interrupted"); //$NON-NLS-1$

      /**

From jswordcvs at crosswire.org  Wed Sep 29 15:21:26 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:28 2004
Subject: [jsword-svn] jsword/java/limbo/org/crosswire/jsword/book/jdbc s
Message-ID: <200409292221.i8TMLQHT008547@www.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 ----

From jswordcvs at crosswire.org  Wed Sep 29 15:21:25 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:30 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/search/parse s
Message-ID: <200409292221.i8TMLPan008474@www.crosswire.org>

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

Modified Files:
	GrammarParamWord.java StartsParamWord.java ParamWord.java 
	RemoveCommandWord.java SubLeftParamWord.java 
	RetainCommandWord.java SubRightParamWord.java Word.java 
	BlurCommandWord.java CommandWord.java AddCommandWord.java 
	DefaultWord.java PassageLeftParamWord.java 
	PassageRightParamWord.java Msg.java 
Added Files:
	IndexSearcher.java 
Log Message:
Fixes for [JS-7] and [JS-6]
Lots of search work and re-factoring

Index: BlurCommandWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/BlurCommandWord.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** BlurCommandWord.java	25 Aug 2004 22:54:37 -0000	1.8
--- BlurCommandWord.java	29 Sep 2004 22:21:23 -0000	1.9
***************
*** 33,39 ****
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.CommandWord#updatePassage(org.crosswire.jsword.book.search.parse.Parser, org.crosswire.jsword.passage.Passage)
       */
!     public void updatePassage(LocalParser engine, Key key) throws BookException
      {
          String word = engine.iterateWord();
--- 33,39 ----
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.CommandWord#updatePassage(org.crosswire.jsword.book.search.parse.Searcher, org.crosswire.jsword.passage.Passage)
       */
!     public void updatePassage(IndexSearcher engine, Key key) throws BookException
      {
          String word = engine.iterateWord();

Index: ParamWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/ParamWord.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ParamWord.java	27 Jul 2004 21:42:37 -0000	1.6
--- ParamWord.java	29 Sep 2004 22:21:23 -0000	1.7
***************
*** 41,45 ****
       * @exception BookException If this action is not appropriate
       */
!     public String getWord(LocalParser engine) throws BookException;

      /**
--- 41,45 ----
       * @exception BookException If this action is not appropriate
       */
!     public String getWord(IndexSearcher engine) throws BookException;

      /**
***************
*** 51,54 ****
       * @exception BookException If this action is not appropriate
       */
!     public Key getKeyList(LocalParser engine) throws BookException;
  }
--- 51,54 ----
       * @exception BookException If this action is not appropriate
       */
!     public Key getKeyList(IndexSearcher engine) throws BookException;
  }

Index: PassageRightParamWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/PassageRightParamWord.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PassageRightParamWord.java	27 Jul 2004 21:42:37 -0000	1.5
--- PassageRightParamWord.java	29 Sep 2004 22:21:23 -0000	1.6
***************
*** 31,37 ****
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public String getWord(LocalParser engine) throws BookException
      {
          throw new BookException(Msg.RIGHT_PARAM);
--- 31,37 ----
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public String getWord(IndexSearcher engine) throws BookException
      {
          throw new BookException(Msg.RIGHT_PARAM);
***************
*** 39,45 ****

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#Key(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public Key getKeyList(LocalParser engine) throws BookException
      {
          throw new BookException(Msg.RIGHT_BRACKETS);
--- 39,45 ----

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#Key(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public Key getKeyList(IndexSearcher engine) throws BookException
      {
          throw new BookException(Msg.RIGHT_BRACKETS);

Index: CommandWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/CommandWord.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CommandWord.java	27 Jul 2004 21:42:37 -0000	1.6
--- CommandWord.java	29 Sep 2004 22:21:23 -0000	1.7
***************
*** 6,10 ****
  /**
   * CommandWord extends Word to allow actions that alter a base
!  * Passage. Implementations of this interface may use the Parser to
   * get at a default Bible (or they may have one hard coded if necessary)
   * or to get at ParamWords that follow this command.
--- 6,10 ----
  /**
   * CommandWord extends Word to allow actions that alter a base
!  * Passage. Implementations of this interface may use the Searcher to
   * get at a default Bible (or they may have one hard coded if necessary)
   * or to get at ParamWords that follow this command.
***************
*** 44,47 ****
       * @param ref The Passage to alter (if necessary)
       */
!     public void updatePassage(LocalParser engine, Key ref) throws BookException;
  }
--- 44,47 ----
       * @param ref The Passage to alter (if necessary)
       */
!     public void updatePassage(IndexSearcher engine, Key ref) throws BookException;
  }

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/Msg.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Msg.java	16 Aug 2004 22:08:42 -0000	1.8
--- Msg.java	29 Sep 2004 22:21:23 -0000	1.9
***************
*** 42,46 ****
      static final Msg BLUR_BLANK = new Msg("BlurCommandWord.BlurBlank"); //$NON-NLS-1$
      static final Msg BLUR_FORMAT = new Msg("BlurCommandWord.BlurFormat"); //$NON-NLS-1$
!     static final Msg ENGINE_SYNTAX = new Msg("LocalParser.EngineSyntax"); //$NON-NLS-1$
      static final Msg ILLEGAL_PASSAGE = new Msg("PassageLeftParamWord.IllegalPassage"); //$NON-NLS-1$
      static final Msg UNMATCHED_ESCAPE = new Msg("CustomTokenizer.UnmatchedEscape"); //$NON-NLS-1$
--- 42,46 ----
      static final Msg BLUR_BLANK = new Msg("BlurCommandWord.BlurBlank"); //$NON-NLS-1$
      static final Msg BLUR_FORMAT = new Msg("BlurCommandWord.BlurFormat"); //$NON-NLS-1$
!     static final Msg ENGINE_SYNTAX = new Msg("IndexSearcher.EngineSyntax"); //$NON-NLS-1$
      static final Msg ILLEGAL_PASSAGE = new Msg("PassageLeftParamWord.IllegalPassage"); //$NON-NLS-1$
      static final Msg UNMATCHED_ESCAPE = new Msg("CustomTokenizer.UnmatchedEscape"); //$NON-NLS-1$

Index: SubLeftParamWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/SubLeftParamWord.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SubLeftParamWord.java	27 Jul 2004 21:42:37 -0000	1.6
--- SubLeftParamWord.java	29 Sep 2004 22:21:23 -0000	1.7
***************
*** 36,42 ****
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public String getWord(LocalParser engine) throws BookException
      {
          throw new BookException(Msg.LEFT_PARAM);
--- 36,42 ----
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public String getWord(IndexSearcher engine) throws BookException
      {
          throw new BookException(Msg.LEFT_PARAM);
***************
*** 44,50 ****

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getPassage(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public Key getKeyList(LocalParser engine) throws BookException
      {
          Iterator it = engine.iterator();
--- 44,50 ----

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getPassage(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public Key getKeyList(IndexSearcher engine) throws BookException
      {
          Iterator it = engine.iterator();
***************
*** 79,83 ****
          }

!         LocalParser subEngine = new LocalParser();
          subEngine.init(engine.getIndex());
          subEngine.setSearchMap(engine.getSearchMap());
--- 79,83 ----
          }

!         IndexSearcher subEngine = new IndexSearcher();
          subEngine.init(engine.getIndex());
          subEngine.setSearchMap(engine.getSearchMap());

Index: PassageLeftParamWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/PassageLeftParamWord.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PassageLeftParamWord.java	16 Aug 2004 22:08:42 -0000	1.7
--- PassageLeftParamWord.java	29 Sep 2004 22:21:23 -0000	1.8
***************
*** 36,42 ****
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public String getWord(LocalParser engine) throws BookException
      {
          throw new BookException(Msg.LEFT_PARAM);
--- 36,42 ----
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public String getWord(IndexSearcher engine) throws BookException
      {
          throw new BookException(Msg.LEFT_PARAM);
***************
*** 44,50 ****

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#Key(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public Key getKeyList(LocalParser engine) throws BookException
      {
          Iterator it = engine.iterator();
--- 44,50 ----

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#Key(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public Key getKeyList(IndexSearcher engine) throws BookException
      {
          Iterator it = engine.iterator();

Index: AddCommandWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/AddCommandWord.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AddCommandWord.java	16 Aug 2004 22:08:42 -0000	1.7
--- AddCommandWord.java	29 Sep 2004 22:21:23 -0000	1.8
***************
*** 32,38 ****
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.CommandWord#updatePassage(org.crosswire.jsword.book.search.parse.Parser, org.crosswire.jsword.passage.Passage)
       */
!     public void updatePassage(LocalParser engine, Key key) throws BookException
      {
          key.addAll(engine.iteratePassage());
--- 32,38 ----
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.CommandWord#updatePassage(org.crosswire.jsword.book.search.parse.Searcher, org.crosswire.jsword.passage.Passage)
       */
!     public void updatePassage(IndexSearcher engine, Key key) throws BookException
      {
          key.addAll(engine.iteratePassage());

Index: Word.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/Word.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Word.java	13 Jun 2004 00:05:21 -0000	1.1
--- Word.java	29 Sep 2004 22:21:23 -0000	1.2
***************
*** 2,6 ****

  /**
!  * The search.Parser uses a Vector of SearchWords to calculate a search.
   * SearchWords itself is an empty interface, that is simply a place holder -
   * extended by CommandWord and Word to provide interfaces that
--- 2,6 ----

  /**
!  * The search.Searcher uses a Vector of SearchWords to calculate a search.
   * SearchWords itself is an empty interface, that is simply a place holder -
   * extended by CommandWord and Word to provide interfaces that

--- NEW FILE: IndexSearcher.java ---
package org.crosswire.jsword.book.search.parse;

import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.crosswire.common.util.ClassUtil;
import org.crosswire.common.util.Logger;
import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.book.Search;
import org.crosswire.jsword.book.search.Index;
import org.crosswire.jsword.book.search.Searcher;
import org.crosswire.jsword.passage.Key;

/**
 * The central interface to all searching.
 * 
 * Functionality the I invisage includes:

 * A simple search syntax that goes something like this.
 *     aaron, moses     (verses containing aaron and moses. Can also use & or +)
 *     
aaron/moses      (verses containing aaron or moses. Can also use |)
 *     
aaron - moses    (verses containing aaron but not moses)
 *     
aaron ~5 , moses (verses with aaron within 5 verses of moses)
 *     
soundslike aaron (verses with words that sound like aaron. Can also use sl ...)
 *     
thesaurus happy  (verses with words that mean happy. Can also use th ...)
 *     
grammar have     (words like has have had and so on. Can also use gr ...)
 * 
The ability to add soundslike type extensions.
 * 
 * 
 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: IndexSearcher.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public class IndexSearcher implements Searcher
{
    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.Searcher#init(org.crosswire.jsword.book.search.Index)
     */
    public void init(Index newindex)
    {
        this.index = newindex;
        this.commands = getWordMap();
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.Searcher#search(java.lang.String, org.crosswire.jsword.passage.Key)
     */
    public Key search(String search, Key restriction) throws BookException
    {
        output = CustomTokenizer.tokenize(search, commands);
        Key key = search(output);

        if (restriction != Search.UNRESTRICTED)
        {
            key.retainAll(restriction);
        }

        return key;
    }

    /**
     * Take a search string and decipher it into a Passage.
     * @param sought The string to be searched for
     * @return The matching verses
     */
    protected Key wordSearch(String sought) throws BookException
    {
        return index.findWord(sought);
    }

    /**
     * Take a search string and decipher it into a Passage.
     * @return The matching verses
     */
    protected Key search(List matches) throws BookException
    {
        Key key = index.findWord(null);

        // Need a CommandWord, but a ParamWord we can deal with using an
        // AddCommandWord chucked on the front
        if (matches.get(0) instanceof ParamWord)
        {
            // Add a default AddCommandWord to the front it there is
            matches.add(0, new AddCommandWord());
        }

        wit = matches.iterator();
        while (wit.hasNext())
        {
            Object temp = wit.next();

            try
            {
                CommandWord command = (CommandWord) temp;
                command.updatePassage(this, key);
            }
            catch (ClassCastException ex)
            {
                ex.printStackTrace();
                throw new BookException(Msg.ENGINE_SYNTAX, new Object[] { temp });
            }
        }

        // Set these to null so that people can't play around
        // with them once they're done with, and to save memory.
        matches = null;
        wit = null;

        return key;
    }

    /**
     * A basic version of getPassage(String[]) simply calls getPassage(String)
     * in a loop for each word, adding the Verses to an Passage that is returned
     * @param words The words to search for
     * @return The Passage
     * @throws BookException If anything goes wrong with this method
     */
    protected Key getPassage(String[] words) throws BookException
    {
        Key ref = index.findWord(null);

        for (int i = 0; i < words.length; i++)
        {
            ref.addAll(wordSearch(words[i]));
        }

        return ref;
    }

    /**
     * Accessor for the Bible to search.
     * @return The current Bible
     */
    protected Index getIndex()
    {
        return index;
    }

    /**
     * Accessor for the available SearchWords. This is probably
     * the same as from Options.getSearchHashtable() but just in
     * case anyone has been playing around with it...
     * @return The Word Hashtable
     */
    protected Map getSearchMap()
    {
        return commands;
    }

    /**
     * Accessor for the available SearchWords. This is probably
     * the same as from Options.getSearchHashtable() but just in
     * case anyone has been playing around with it...
     */
    protected void setSearchMap(Map commands)
    {
        this.commands = commands;
    }

    /**
     * Most Words need to access parameters, this method allows them access to
     * the Searcher's own Enumerator. Use with care, and only if you are a Word
     * taking part in the current search.
     * @return The current Iterator
     */
    protected Iterator iterator()
    {
        return wit;
    }

    /**
     * @throws BookException
     */
    public Key iteratePassage() throws BookException
    {
        if (!iterator().hasNext())
        {
            throw new BookException(Msg.RETAIN_BLANK);
        }

        Object next = iterator().next();
        if (!(next instanceof ParamWord))
        {
            log.error("next=" + next); //$NON-NLS-1$
        }

        ParamWord param = (ParamWord) next;
        Key ref = param.getKeyList(this);

        return ref;
    }

    /**
     * @throws BookException
     */
    public String iterateWord() throws BookException
    {
        if (!iterator().hasNext())
        {
            throw new BookException(Msg.RETAIN_BLANK);
        }

        Object next = iterator().next();
        if (!(next instanceof ParamWord))
        {
            log.error("next=" + next); //$NON-NLS-1$
        }

        ParamWord param = (ParamWord) next;
        String word = param.getWord(this);

        return word;
    }

    /**
     * Accessor for the cached list of known special lookup words
     */
    public static Map getWordMap()
    {
        if (wordMap == null)
        {
            Map classes = ClassUtil.getImplementorsMap(Word.class);
            wordMap = new HashMap();

            for (Iterator it = classes.keySet().iterator(); it.hasNext(); )
            {
                String key = (String) it.next();
                Class clazz = (Class) classes.get(key);

                try
                {
                    wordMap.put(key, clazz.newInstance());
                }
                catch (Exception ex)
                {
                    log.error("can't add CommandWord: key=" + key + " Class=" + clazz.getName(), ex); //$NON-NLS-1$ //$NON-NLS-2$
                }
            }
        }

        return wordMap;
    }

    /**
     * The log stream
     */
    private static final Logger log = Logger.getLogger(IndexSearcher.class);

    /**
     * The cache of known words
     */
    private static Map wordMap = null;

    /**
     * The parsed version of the current string
     */
    private List output = null;

    /**
     * The commands that we know about
     */
    private Map commands = null;

    /**
     * While the answer is being worked out ...
     */
    private Iterator wit = null;

    /**
     * The index
     */
    private Index index = null;
}

Index: StartsParamWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/StartsParamWord.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** StartsParamWord.java	16 Aug 2004 22:08:42 -0000	1.9
--- StartsParamWord.java	29 Sep 2004 22:21:23 -0000	1.10
***************
*** 4,12 ****

  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.passage.Key;

  /**
!  * The Search Word for a Word to search for. The default if no other SearchWords
!  * match.
   * 
   * 

--- 4,13 ----

  import org.crosswire.jsword.book.BookException;
+ import org.crosswire.jsword.book.search.Thesaurus;
+ import org.crosswire.jsword.book.search.ThesaurusFactory;
  import org.crosswire.jsword.passage.Key;

  /**
!  * The Search Word for a Word to search for.
   * 
   * 

***************
*** 33,40 ****
  public class StartsParamWord implements ParamWord
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public String getWord(LocalParser engine) throws BookException
      {
          throw new BookException(Msg.STARTS_WORD);
--- 34,49 ----
  public class StartsParamWord implements ParamWord
  {
+     /**
+      * Default ctor
+      */
+     public StartsParamWord() throws InstantiationException
+     {
+         thesaurus = ThesaurusFactory.createThesaurus();
+     }
+ 
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public String getWord(IndexSearcher engine) throws BookException
      {
          throw new BookException(Msg.STARTS_WORD);
***************
*** 45,58 ****
       * 100% match for the Passage interface. Maybe this needs to be fixed
       * somehow.
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getKeyList(org.crosswire.jsword.book.search.parse.LocalParser)
       */
!     public Key getKeyList(LocalParser engine) throws BookException
      {
          String word = engine.iterateWord();

!         Collection col = engine.getIndex().getStartsWith(word);
          String[] words = (String[]) col.toArray(new String[col.size()]);

          return engine.getPassage(words);
      }
  }
--- 54,72 ----
       * 100% match for the Passage interface. Maybe this needs to be fixed
       * somehow.
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getKeyList(org.crosswire.jsword.book.search.parse.IndexSearcher)
       */
!     public Key getKeyList(IndexSearcher engine) throws BookException
      {
          String word = engine.iterateWord();

!         Collection col = thesaurus.getSynonyms(word);
          String[] words = (String[]) col.toArray(new String[col.size()]);

          return engine.getPassage(words);
      }
+ 
+     /**
+      * The source of thesaurus data
+      */
+     private Thesaurus thesaurus = null;
  }

Index: GrammarParamWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/GrammarParamWord.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GrammarParamWord.java	16 Aug 2004 22:08:42 -0000	1.9
--- GrammarParamWord.java	29 Sep 2004 22:21:23 -0000	1.10
***************
*** 4,7 ****
--- 4,10 ----

  import org.crosswire.jsword.book.BookException;
+ import org.crosswire.jsword.book.search.Grammar;
+ import org.crosswire.jsword.book.search.Thesaurus;
+ import org.crosswire.jsword.book.search.ThesaurusFactory;
  import org.crosswire.jsword.passage.Key;

***************
*** 33,40 ****
  public class GrammarParamWord implements ParamWord
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.LocalParser)
       */
!     public String getWord(LocalParser engine) throws BookException
      {
          throw new BookException(Msg.GRAMMAR_WORD);
--- 36,51 ----
  public class GrammarParamWord implements ParamWord
  {
+     /**
+      * Default ctor
+      */
+     public GrammarParamWord() throws InstantiationException
+     {
+         thesaurus = ThesaurusFactory.createThesaurus();
+     }
+ 
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.IndexSearcher)
       */
!     public String getWord(IndexSearcher engine) throws BookException
      {
          throw new BookException(Msg.GRAMMAR_WORD);
***************
*** 42,55 ****

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getPassage(org.crosswire.jsword.book.search.parse.LocalParser)
       */
!     public Key getKeyList(LocalParser engine) throws BookException
      {
          String root = Grammar.getRoot(engine.iterateWord());

!         Collection col = engine.getIndex().getStartsWith(root);
          String[] words = (String[]) col.toArray(new String[col.size()]);

          return engine.getPassage(words);
      }
  }
--- 53,71 ----

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getPassage(org.crosswire.jsword.book.search.parse.IndexSearcher)
       */
!     public Key getKeyList(IndexSearcher engine) throws BookException
      {
          String root = Grammar.getRoot(engine.iterateWord());

!         Collection col = thesaurus.getSynonyms(root);
          String[] words = (String[]) col.toArray(new String[col.size()]);

          return engine.getPassage(words);
      }
+ 
+     /**
+      * The source of thesaurus data
+      */
+     private Thesaurus thesaurus = null;
  }

Index: RetainCommandWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/RetainCommandWord.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RetainCommandWord.java	27 Jul 2004 21:42:37 -0000	1.6
--- RetainCommandWord.java	29 Sep 2004 22:21:23 -0000	1.7
***************
*** 32,38 ****
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.CommandWord#updatePassage(org.crosswire.jsword.book.search.parse.Parser, org.crosswire.jsword.passage.Passage)
       */
!     public void updatePassage(LocalParser engine, Key key) throws BookException
      {
          key.retainAll(engine.iteratePassage());
--- 32,38 ----
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.CommandWord#updatePassage(org.crosswire.jsword.book.search.parse.Searcher, org.crosswire.jsword.passage.Passage)
       */
!     public void updatePassage(IndexSearcher engine, Key key) throws BookException
      {
          key.retainAll(engine.iteratePassage());

Index: SubRightParamWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/SubRightParamWord.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SubRightParamWord.java	27 Jul 2004 21:42:37 -0000	1.5
--- SubRightParamWord.java	29 Sep 2004 22:21:23 -0000	1.6
***************
*** 31,37 ****
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public String getWord(LocalParser engine) throws BookException
      {
          throw new BookException(Msg.RIGHT_PARAM);
--- 31,37 ----
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public String getWord(IndexSearcher engine) throws BookException
      {
          throw new BookException(Msg.RIGHT_PARAM);
***************
*** 39,45 ****

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getPassage(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public Key getKeyList(LocalParser engine) throws BookException
      {
          throw new BookException(Msg.RIGHT_BRACKETS);
--- 39,45 ----

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getPassage(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public Key getKeyList(IndexSearcher engine) throws BookException
      {
          throw new BookException(Msg.RIGHT_BRACKETS);

Index: RemoveCommandWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/RemoveCommandWord.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RemoveCommandWord.java	16 Aug 2004 22:08:42 -0000	1.7
--- RemoveCommandWord.java	29 Sep 2004 22:21:23 -0000	1.8
***************
*** 32,38 ****
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.CommandWord#updatePassage(org.crosswire.jsword.book.search.parse.Parser, org.crosswire.jsword.passage.Passage)
       */
!     public void updatePassage(LocalParser engine, Key key) throws BookException
      {
          key.removeAll(engine.iteratePassage());
--- 32,38 ----
  {
      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.CommandWord#updatePassage(org.crosswire.jsword.book.search.parse.Searcher, org.crosswire.jsword.passage.Passage)
       */
!     public void updatePassage(IndexSearcher engine, Key key) throws BookException
      {
          key.removeAll(engine.iteratePassage());

Index: DefaultWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/parse/DefaultWord.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultWord.java	8 Sep 2004 19:55:07 -0000	1.5
--- DefaultWord.java	29 Sep 2004 22:21:23 -0000	1.6
***************
*** 42,48 ****

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.LocalParser)
       */
!     public String getWord(LocalParser engine)
      {
          return text;
--- 42,48 ----

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.IndexSearcher)
       */
!     public String getWord(IndexSearcher engine)
      {
          return text;
***************
*** 58,64 ****

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getPassage(org.crosswire.jsword.book.search.parse.LocalParser)
       */
!     public Key getKeyList(LocalParser engine) throws BookException
      {
          return engine.wordSearch(text);
--- 58,64 ----

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getPassage(org.crosswire.jsword.book.search.parse.IndexSearcher)
       */
!     public Key getKeyList(IndexSearcher engine) throws BookException
      {
          return engine.wordSearch(text);
***************
*** 66,72 ****

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.CommandWord#updatePassage(org.crosswire.jsword.book.search.parse.Parser, org.crosswire.jsword.passage.Passage)
       */
!     public void updatePassage(LocalParser engine, Key key) throws BookException
      {
          // We need to have DefaultWord pretend to be a CommandWord so that
--- 66,72 ----

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.CommandWord#updatePassage(org.crosswire.jsword.book.search.parse.Searcher, org.crosswire.jsword.passage.Passage)
       */
!     public void updatePassage(IndexSearcher engine, Key key) throws BookException
      {
          // We need to have DefaultWord pretend to be a CommandWord so that

From jswordcvs at crosswire.org  Wed Sep 29 15:21:26 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:30 2004
Subject: [jsword-svn] jsword/java/limbo/org/crosswire/jsword/book/ser s
Message-ID: <200409292221.i8TMLQwj008535@www.crosswire.org>

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

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

Index: SerBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/limbo/org/crosswire/jsword/book/ser/SerBook.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SerBook.java	25 Aug 2004 22:54:37 -0000	1.3
--- SerBook.java	29 Sep 2004 22:21:23 -0000	1.4
***************
*** 160,165 ****
              throw new BookException(Msg.SER_INIT, ex);
          }
- 
-         initSearchEngine();
      }

--- 160,163 ----

From jswordcvs at crosswire.org  Wed Sep 29 15:21:26 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:30 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/search/index s
Message-ID: <200409292221.i8TMLQhR008558@www.crosswire.org>

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

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

--- NEW FILE: IndexMatcher.java ---
package org.crosswire.jsword.book.search.index;

import java.util.Collection;

import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.book.Search;
import org.crosswire.jsword.book.SentanceUtil;
import org.crosswire.jsword.book.search.Grammar;
import org.crosswire.jsword.book.search.Index;
import org.crosswire.jsword.book.search.Matcher;
import org.crosswire.jsword.book.search.Thesaurus;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.PassageTally;
import org.crosswire.jsword.passage.RestrictionType;

/**
 * An implementation of Matcher that uses an Index and a Thesaurus.
 * 
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: IndexMatcher.java,v 1.1 2004/09/29 22:21:24 joe Exp $
 */
public class IndexMatcher implements Matcher
{
    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.Matcher#init(org.crosswire.jsword.book.search.Index)
     */
    public void init(Index newIndex, Thesaurus newThesaurus)
    {
        this.index = newIndex;
        this.thesaurus = newThesaurus;
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.Matcher#bestMatch(java.lang.String, org.crosswire.jsword.passage.Key)
     */
    public Key bestMatch(String sought, Key restriction) throws BookException
    {
        String[] words = SentanceUtil.getWords(sought);
        words = Grammar.stripSmallWords(words);
        // log.fine("words="+StringUtil.toString(words));

        PassageTally tally = new PassageTally();
        tally.blur(BLUR_BY, RestrictionType.NONE);

        for (int i = 0; i < words.length; i++)
        {
            tally.addAll(index.findWord(words[i]));
        }

        // This uses updatePassageTallyFlat() so that words like God
        // that have many startsWith() matches, and hence many verse
        // matches, do not end up with wrongly high scores.
        for (int i = 0; i < words.length; i++)
        {
            // log.fine("considering="+words[i]);
            String root = Grammar.getRoot(words[i]);

            // Check that the root is still a word. If not then we
            // use the full version. This catches misses like se is
            // the root of seed, and matches sea and so on ...
            Key ref = index.findWord(root);
            if (ref.isEmpty())
            {
                root = words[i];
            }

            // log.fine("  root="+root);
            Collection col = thesaurus.getSynonyms(root);
            String[] grWords = (String[]) col.toArray(new String[col.size()]);

            // log.fine("  gr_words="+StringUtil.toString(gr_words));
            PassageTally temp = new PassageTally();

            for (int j = 0; j < grWords.length; j++)
            {
                temp.addAll(index.findWord(grWords[j]));
            }

            temp.flatten();
            tally.addAll(temp);
        }

        if (!restriction.equals(Search.UNRESTRICTED))
        {
            tally.retainAll(restriction);
        }

        return tally;
    }

    /**
     * How we get related words
     */
    private Thesaurus thesaurus;

    /**
     * How many verses do we blur by?
     */
    private static final int BLUR_BY = 2;

    /**
     * The index that we use to search for words in
     */
    private Index index;
}

From jswordcvs at crosswire.org  Wed Sep 29 15:21:25 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:30 2004
Subject: [jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/search s
Message-ID: <200409292221.i8TMLPhm008459@www.crosswire.org>

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

Modified Files:
	Index.java Msg.java Msg.properties 
Added Files:
	Matcher.java Thesaurus.properties IndexFactory.java 
	Matcher.properties IndexManager.java ThesaurusFactory.java 
	Searcher.java Grammar.java MatcherFactory.java 
	Searcher.properties SearcherFactory.java Thesaurus.java 
	Index.properties 
Removed Files:
	Parser.java ParserFactory.java SearchEngineFactory.java 
	AbstractSearchEngine.java SearchEngine.java Parser.properties 
	SearchEngine.properties 
Log Message:
Fixes for [JS-7] and [JS-6]
Lots of search work and re-factoring

--- NEW FILE: Searcher.properties ---

default=org.crosswire.jsword.book.search.parse.IndexSearcher

--- NEW FILE: Thesaurus.properties ---

default=org.crosswire.jsword.book.search.basic.NullThesaurus

--- NEW FILE: Searcher.java ---
package org.crosswire.jsword.book.search;

import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.passage.Key;

/**
 * The central interface to all searching.
 * 
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: Searcher.java,v 1.5 2004/09/29 22:21:23 joe Exp $
 */
public interface Searcher
{
    /**
     * Setup the index that this parser can use to do word level searches
     * @param index The Index to query for words
     */
    public void init(Index index);

    /**
     * Take a search string and decipher it into a Passage.
     * @param search The string to be searched for
     * @param restriction What verses are we interested in looking in?
     * @see org.crosswire.jsword.book.Search#UNRESTRICTED
     * @return The matching verses
     */
    public Key search(String search, Key restriction) throws BookException;
}

--- NEW FILE: MatcherFactory.java ---
package org.crosswire.jsword.book.search;

import org.crosswire.common.util.ClassUtil;
import org.crosswire.common.util.Logger;

/**
 * Factory method for creating a new Matcher.
 * 
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: MatcherFactory.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public class MatcherFactory
{
    /**
     * Prevent Instansiation
     */
    private MatcherFactory()
    {
    }

    /**
     * Create a new Matcher.
     */
    public static Matcher createMatcher(Index index, Thesaurus thesaurus) throws InstantiationException
    {
        try
        {
            Class impl = ClassUtil.getImplementor(Matcher.class);
            Matcher matcher = (Matcher) impl.newInstance();
            matcher.init(index, thesaurus);

            return matcher;
        }
        catch (Exception ex)
        {
            log.error("createMatcher failed", ex); //$NON-NLS-1$
            throw new InstantiationException();
        }
    }

    /**
     * The log stream
     */
    private static final Logger log = Logger.getLogger(MatcherFactory.class);
}

--- NEW FILE: ThesaurusFactory.java ---
package org.crosswire.jsword.book.search;

import org.crosswire.common.util.ClassUtil;
import org.crosswire.common.util.Logger;

/**
 * Factory method for creating a new Thesaurus.
 * 
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: ThesaurusFactory.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public class ThesaurusFactory
{
    /**
     * Prevent Instansiation
     */
    private ThesaurusFactory()
    {
    }

    /**
     * Create a new Thesaurus.
     */
    public static Thesaurus createThesaurus() throws InstantiationException
    {
        try
        {
            Class impl = ClassUtil.getImplementor(Thesaurus.class);
            Thesaurus thesaurus = (Thesaurus) impl.newInstance();

            return thesaurus;
        }
        catch (Exception ex)
        {
            log.error("createThesaurus failed", ex); //$NON-NLS-1$
            throw new InstantiationException();
        }
    }

    /**
     * The log stream
     */
    private static final Logger log = Logger.getLogger(ThesaurusFactory.class);
}

--- SearchEngineFactory.java DELETED ---

--- NEW FILE: SearcherFactory.java ---
package org.crosswire.jsword.book.search;

import org.crosswire.common.util.ClassUtil;
import org.crosswire.common.util.Logger;

/**
 * Factory method for creating a new Searcher.
 * 
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: SearcherFactory.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public class SearcherFactory
{
    /**
     * Prevent Instansiation
     */
    private SearcherFactory()
    {
    }

    /**
     * Create a new Searcher.
     */
    public static Searcher createSearcher(Index index) throws InstantiationException
    {
        try
        {
            Class impl = ClassUtil.getImplementor(Searcher.class);
            Searcher parser = (Searcher) impl.newInstance();
            parser.init(index);

            return parser;
        }
        catch (Exception ex)
        {
            log.error("createSearcher failed", ex); //$NON-NLS-1$
            throw new InstantiationException();
        }
    }

    /**
     * The log stream
     */
    private static final Logger log = Logger.getLogger(SearcherFactory.class);
}

--- SearchEngine.properties DELETED ---

--- NEW FILE: Grammar.java ---
package org.crosswire.jsword.book.search;

import org.crosswire.common.util.StringUtil;

/**
 * A class representing various grammatical constructs (in English).
 *
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: Grammar.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public class Grammar
{
    /**
     * Prevent Instansiation
     */
    private Grammar()
    {
    }

    /**
     * Strip of any parts of speech to leave a root word.
     * This class may not be the best place for this code, however I'm not
     * sure if we have a better place for it at the mo. Maybe it should be
     * in passage.PassageUtil?
     * @param word The word to strip
     * @return The root word
     */
    public static String getRoot(String word)
    {
        for (int i = 0; i < ENDINGS.length; i++)
        {
            if (word.endsWith(ENDINGS[i]))
            {
                // Make the assumption that we never have 2 ending on a word
                return word.substring(0, word.length() - ENDINGS[i].length());
            }
        }

        return word;
    }

    /**
     * Is this word one of those small words that can slaughter a DB
     * query. An empty string IS a small word.
     * @param word The word to test
     */
    public static boolean isSmallWord(String word)
    {
        word = word.trim();
        if (word.equals("")) //$NON-NLS-1$
        {
            return true;
        }

        for (int i = 0; i < WORD_FREQ.length; i++)
        {
            if (word.equalsIgnoreCase(WORD_FREQ[i]))
            {
                return true;
            }
        }

        return false;
    }

    /**
     * Is this word one of those small words that can slaughter a DB query
     */
    public static String[] stripSmallWords(String[] words)
    {
        // How many long words are there?
        int long_words = 0;
        for (int i = 0; i < words.length; i++)
        {
            if (!isSmallWord(words[i]))
            {
                long_words++;
            }
        }

        // Create the array with just the long words
        int count = 0;
        String[] retcode = new String[long_words];
        for (int i = 0; i < words.length; i++)
        {
            if (!isSmallWord(words[i]))
            {
                retcode[count++] = words[i];
            }
        }

        return retcode;
    }

    /**
     * Like PassageUtil.tokenize that leaves out the small words
     * @param original The sentance to split up
     * @param delims The word separators
     * @return The long words in the string
     */
    public static String[] tokenizeWithoutSmallWords(String original, String delims)
    {
        String[] words = StringUtil.split(original, delims);
        int small_words = 0;

        for (int i = 0; i < words.length; i++)
        {
            if (Grammar.isSmallWord(words[i]))
            {
                small_words++;
                words[i] = null;
            }
        }

        String [] retcode = new String[words.length - small_words];
        int count = 0;
        for (int i = 0; i < words.length; i++)
        {
            if (words[i] != null)
            {
                retcode[count++] = words[i];
            }
        }

        return retcode;
    }

    /**
     * The Endings a word can have.
     * These are matched in order so there is no point in having "s"
     * before "es" because the second will not be tried.
     */
    private static final String[] ENDINGS =
    {
        "es", //$NON-NLS-1$
        "'s", //$NON-NLS-1$
        "s", //$NON-NLS-1$
        "ing", //$NON-NLS-1$
        "ed", //$NON-NLS-1$
        "er", //$NON-NLS-1$
        "ly", //$NON-NLS-1$
    };

    /**
     * The one hundred most used words, and the instance count
     */
    private static final String[] WORD_FREQ =
    {
        // word     instance count (in AV & NIV)
        "the",      // 119135 //$NON-NLS-1$
        "and",      // 81244 //$NON-NLS-1$
        "of",       // 59417 //$NON-NLS-1$
        "to",       // 43624 //$NON-NLS-1$
        "in",       // 24233 //$NON-NLS-1$
        "he",       // 20088 //$NON-NLS-1$
        "that",     // 18672 //$NON-NLS-1$
        "i",        // 17605 //$NON-NLS-1$
        "a",        // 17439 //$NON-NLS-1$
        "for",      // 16780 //$NON-NLS-1$
        "you",      // 16324 //$NON-NLS-1$
        "his",      // 15438 //$NON-NLS-1$
//      "lord",     // 15319
        "is",       // 14304 //$NON-NLS-1$
        "will",     // 13981 //$NON-NLS-1$
        "they",     // 13942 //$NON-NLS-1$
        "not",      // 12507 //$NON-NLS-1$
        "with",     // 12125 //$NON-NLS-1$
        "him",      // 12058 //$NON-NLS-1$
        "it",       // 11834 //$NON-NLS-1$
        "be",       // 11638 //$NON-NLS-1$
        "them",     // 11608 //$NON-NLS-1$
        "shall",    // 10833 //$NON-NLS-1$
        "all",      // 10333 //$NON-NLS-1$
        "my",       // 9547 //$NON-NLS-1$
        "from",     // 9323 //$NON-NLS-1$
        "was",      // 8530 //$NON-NLS-1$
        "your",     // 8400 //$NON-NLS-1$
//      "god",      // 8381
        "have",     // 8322 //$NON-NLS-1$
        "me",       // 8102 //$NON-NLS-1$
        "but",      // 7991 //$NON-NLS-1$
        "their",    // 7638 //$NON-NLS-1$
        "as",       // 7521 //$NON-NLS-1$
        "who",      // 7425 //$NON-NLS-1$
        "said",     // 7198 //$NON-NLS-1$
        "are",      // 6981 //$NON-NLS-1$
        "on",       // 6914 //$NON-NLS-1$
        "this",     // 6558 //$NON-NLS-1$
        "when",     // 5667 //$NON-NLS-1$
        "thou",     // 5470 //$NON-NLS-1$
        "thy",      // 5469 //$NON-NLS-1$
        "by",       // 5434 //$NON-NLS-1$
        "were",     // 5192 //$NON-NLS-1$
        "had",      // 5109 //$NON-NLS-1$
        "then",     // 5105 //$NON-NLS-1$
        "out",      // 4778 //$NON-NLS-1$
//      "man",      // 4702
//      "son",      // 4701
        "so",       // 4689 //$NON-NLS-1$
//      "king",     // 4568
//      "israel",   // 4407
        "there",    // 4393 //$NON-NLS-1$
//      "people",   // 4355
        "which",    // 4253 //$NON-NLS-1$
        "do",       // 4032 //$NON-NLS-1$
        "one",      // 3998 //$NON-NLS-1$
        "ye",       // 3970 //$NON-NLS-1$
        "up",       // 3798 //$NON-NLS-1$
        "thee",     // 3780 //$NON-NLS-1$
        "at",       // 3767 //$NON-NLS-1$
        "we",       // 3725 //$NON-NLS-1$
        "her",      // 3583 //$NON-NLS-1$
        "what",     // 3545 //$NON-NLS-1$
        "men",      // 3482 //$NON-NLS-1$
        "come",     // 3404 //$NON-NLS-1$
        "if",       // 3380 //$NON-NLS-1$
        "into",     // 3284 //$NON-NLS-1$
        "came",     // 3283 //$NON-NLS-1$
//      "land",     // 3182
//      "day",      // 3168
        "upon",     // 3164 //$NON-NLS-1$
        "before",   // 3133 //$NON-NLS-1$
        "or",       // 3097 //$NON-NLS-1$
//      "house",    // 2997
        "us",       // 2886 //$NON-NLS-1$
        "because",  // 2879 //$NON-NLS-1$
        "go",       // 2869 //$NON-NLS-1$
//      "against",  // 2851
        "an",       // 2828 //$NON-NLS-1$
//      "no",       // 2711
        "went",     // 2597 //$NON-NLS-1$
        "also",     // 2586 //$NON-NLS-1$
        "now",      // 2571 //$NON-NLS-1$
        "let",      // 2548 //$NON-NLS-1$
//      "made",     // 2478
        "hath",     // 2450 //$NON-NLS-1$
        "may",      // 2418 //$NON-NLS-1$
        "has",      // 2406 //$NON-NLS-1$
        "our",      // 2361 //$NON-NLS-1$
        "these",    // 2356 //$NON-NLS-1$
//      "down",     // 2314
//      "hand",     // 2314
//      "jesus",    // 2255
//      "children", // 2231
//      "like",     // 2180
//      "over",     // 2091
        "o",        // 2090 //$NON-NLS-1$
//      "david",    // 2089
//      "father",   // 2065
        "am", //$NON-NLS-1$
    };
}

--- SearchEngine.java DELETED ---

--- NEW FILE: IndexFactory.java ---
package org.crosswire.jsword.book.search;

import org.crosswire.common.util.ClassUtil;
import org.crosswire.common.util.Logger;
import org.crosswire.jsword.book.Book;

/**
 * Factory method for creating a new Searcher.
 * 
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: IndexFactory.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public class IndexFactory
{
    /**
     * Prevent Instansiation
     */
    private IndexFactory()
    {
    }

    /**
     * Create a new Searcher.
     */
    public static Index getIndexForBook(Book book) throws InstantiationException
    {
        try
        {
            Class impl = ClassUtil.getImplementor(Index.class);
            Index index = (Index) impl.newInstance();
            index.init(book);

            return index;
        }
        catch (Exception ex)
        {
            log.error("createParser failed", ex); //$NON-NLS-1$
            throw new InstantiationException();
        }
    }

    /**
     * The log stream
     */
    private static final Logger log = Logger.getLogger(IndexFactory.class);
}

Index: Index.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/Index.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Index.java	16 Aug 2004 22:08:43 -0000	1.7
--- Index.java	29 Sep 2004 22:21:23 -0000	1.8
***************
*** 1,6 ****
  package org.crosswire.jsword.book.search;

! import java.util.Collection;

  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.passage.Key;
--- 1,8 ----
  package org.crosswire.jsword.book.search;

! import java.io.IOException;

+ import org.crosswire.common.progress.Job;
+ import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.passage.Key;
***************
*** 34,45 ****
  {
      /**
!      * Return an array of words that are used by this Bible that start with the
!      * given string. For example calling:
!      * getStartsWith("love") will return something like:
!      * { "love", "loves", "lover", "lovely", ... }
!      * @param word The word to base your word array on
!      * @return An array of words starting with the base
       */
!     public Collection getStartsWith(String word) throws BookException;

      /**
--- 36,45 ----
  {
      /**
!      * An initializer type method so we can configure the Search engine at
!      * runtime. This method is run first of all, before anything else and should
!      * do everything it can to ensure that future method calls will be error
!      * free without consuming significant system resources.
       */
!     public void init(Book book) throws BookException;

      /**
***************
*** 62,64 ****
--- 62,85 ----
       */
      public Key getKey(String name) throws NoSuchKeyException;
+ 
+     /**
+      * Tidy up after yourself and remove all the files that make up any indexes
+      * you created.
+      */
+     public void delete() throws BookException;
+ 
+     /**
+      * Detects if index data has been stored for this Bible already
+      */
+     public boolean isIndexed();
+ 
+     /**
+      * Read from the given source version to generate ourselves. On completion
+      * of this method the index should be usable. If this is not the natural
+      * way this emthod finishes then it should be possible to call loadIndexes()
+      * @param ajob The place to report progress
+      * @throws IOException if the load fails to read from disk
+      * @throws BookException if there is a problem reading from the Bible
+      */
+     public void generateSearchIndex(Job ajob) throws IOException, BookException, NoSuchKeyException;
  }

--- NEW FILE: IndexManager.java ---
package org.crosswire.jsword.book.search;

import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

import org.crosswire.common.progress.Job;
import org.crosswire.common.progress.JobManager;
import org.crosswire.common.util.Reporter;

/**
 * .
 * 
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: IndexManager.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public class IndexManager
{
    /**
     * 
     */
    public static IndexManager instance()
    {
        return instance;
    }

    /**
     * 
     */
    public void createIndex(Index index)
    {
        Reporter.informUser(this, Msg.TYPE_INDEXGEN);

        todo.add(index);

        Thread work = new Thread(runner);
        work.start();
    }

    /**
     * The index creation thread
     */
    private class IndexerRunnable implements Runnable
    {
        /* (non-Javadoc)
         * @see java.lang.Runnable#run()
         */
        public void run()
        {
            running = true;

            Iterator it = todo.iterator();
            while (it.hasNext())
            {
                Index index = (Index) it.next();
                Job job = JobManager.createJob(Msg.INDEXING.toString(), Thread.currentThread(), false);

                try
                {
                    index.generateSearchIndex(job);
                }
                catch (Exception ex)
                {
                    Reporter.informUser(IndexManager.class, ex);
                    job.ignoreTimings();
                }
                finally
                {
                    job.done();
                }                
            }

            running = false;
        }
    }

    /**
     * 
     */
    private static IndexManager instance = new IndexManager();

    /**
     * The thread worker that creates the indexes.
     */
    private Runnable runner = new IndexerRunnable();

    /**
     * The books to be indexed
     */
    protected Set todo = new HashSet();

    /**
     * Is there an index generation in progress?
     */
    protected boolean running = false;
}

Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/Msg.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Msg.properties	14 Jun 2004 05:27:22 -0000	1.1
--- Msg.properties	29 Sep 2004 22:21:23 -0000	1.2
***************
*** 6,10 ****
  # It should have no spaces or other punctuation (e.g. _, -, ', ...)

! SearchEngineFactory.SearchInit=Failed to initialise search engine.
! AbstractSearchEngine.TypeIndexGen=Generating index for this work. Search results will be more accurate when index is complete.
! AbstractSearchEngine.Indexing=Indexing Bible Data
--- 6,9 ----
  # It should have no spaces or other punctuation (e.g. _, -, ', ...)

! IndexManager.TypeIndexGen=Generating index for this work. Search results will be more accurate when index is complete.
! IndexManager.Indexing=Indexing Bible Data

--- NEW FILE: Matcher.java ---
package org.crosswire.jsword.book.search;

import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.passage.Key;

/**
 * .
 * 
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: Matcher.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public interface Matcher
{
    /**
     * Setup the index that this parser can use to do word level searches
     * @param index The Index to query for words
     */
    public void init(Index index, Thesaurus thesaurus);

    /**
     * Generate a bestmatch search
     * @param sought The phrase to match
     * @param restriction What verses are we interested in looking in?
     * @see org.crosswire.jsword.book.Search#UNRESTRICTED
     * @return The matching verses
     */
    public Key bestMatch(String sought, Key restriction) throws BookException;
}

--- NEW FILE: Index.properties ---

default=org.crosswire.jsword.book.search.lucene.LuceneIndex
#default=org.crosswire.jsword.book.search.ser.SerIndex

lucene=org.crosswire.jsword.book.search.lucene.LuceneIndex
ser=org.crosswire.jsword.book.search.ser.SerIndex

--- NEW FILE: Thesaurus.java ---
package org.crosswire.jsword.book.search;

import java.util.Collection;

import org.crosswire.jsword.book.BookException;

/**
 * A source of synonym data for a given word.
 * 
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: Thesaurus.java,v 1.1 2004/09/29 22:21:23 joe Exp $
 */
public interface Thesaurus
{
    /**
     * Return an array of words that are used by this Bible that start with the
     * given string. For example calling:
     * getStartsWith("love") will return something like:
     * { "love", "loves", "lover", "lovely", ... }
     * @param word The word to base your word array on
     * @return An array of words starting with the base
     */
    public Collection getSynonyms(String word) throws BookException;
}

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/Msg.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Msg.java	16 Aug 2004 22:08:43 -0000	1.8
--- Msg.java	29 Sep 2004 22:21:23 -0000	1.9
***************
*** 29,35 ****
  class Msg extends MsgBase
  {
!     static final Msg SEARCH_INIT = new Msg("SearchEngineFactory.SearchInit"); //$NON-NLS-1$
!     static final Msg TYPE_INDEXGEN = new Msg("AbstractSearchEngine.TypeIndexGen"); //$NON-NLS-1$
!     static final Msg INDEXING = new Msg("AbstractSearchEngine.Indexing"); //$NON-NLS-1$

      /**
--- 29,34 ----
  class Msg extends MsgBase
  {
!     static final Msg TYPE_INDEXGEN = new Msg("IndexManager.TypeIndexGen"); //$NON-NLS-1$
!     static final Msg INDEXING = new Msg("IndexManager.Indexing"); //$NON-NLS-1$

      /**

--- NEW FILE: Matcher.properties ---

default=org.crosswire.jsword.book.search.index.IndexMatcher

--- Parser.java DELETED ---

--- Parser.properties DELETED ---

--- AbstractSearchEngine.java DELETED ---

--- ParserFactory.java DELETED ---

From jswordcvs at crosswire.org  Wed Sep 29 15:21:25 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:30 2004
Subject: [jsword-svn] 
	jsword/java/jswordtest/org/crosswire/jsword/book/search/parse s
Message-ID: <200409292221.i8TMLPwE008504@www.crosswire.org>

Update of /cvs/jsword/jsword/java/jswordtest/org/crosswire/jsword/book/search/parse
In directory www.crosswire.org:/tmp/cvs-serv8429/java/jswordtest/org/crosswire/jsword/book/search/parse

Modified Files:
	WordsTest.java CustomTokenizerTest.java DictionaryTest.java 
	ParserTest.java FixtureParamWord.java 
Log Message:
Fixes for [JS-7] and [JS-6]
Lots of search work and re-factoring

Index: CustomTokenizerTest.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jswordtest/org/crosswire/jsword/book/search/parse/CustomTokenizerTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CustomTokenizerTest.java	13 Jun 2004 00:05:22 -0000	1.4
--- CustomTokenizerTest.java	29 Sep 2004 22:21:23 -0000	1.5
***************
*** 48,52 ****
      public void testGetStringArray() throws Exception
      {
!         Map commands = LocalParser.getWordMap();
          List output = null;

--- 48,52 ----
      public void testGetStringArray() throws Exception
      {
!         Map commands = IndexSearcher.getWordMap();
          List output = null;

Index: WordsTest.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jswordtest/org/crosswire/jsword/book/search/parse/WordsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WordsTest.java	16 Aug 2004 22:08:44 -0000	1.2
--- WordsTest.java	29 Sep 2004 22:21:23 -0000	1.3
***************
*** 38,46 ****
      }

!     private LocalParser engine = null;

      protected void setUp() throws Exception
      {
!         Map commands = LocalParser.getWordMap();

          commands.put("t1", new FixtureParamWord("Rut 2")); //$NON-NLS-1$ //$NON-NLS-2$
--- 38,46 ----
      }

!     private IndexSearcher engine = null;

      protected void setUp() throws Exception
      {
!         Map commands = IndexSearcher.getWordMap();

          commands.put("t1", new FixtureParamWord("Rut 2")); //$NON-NLS-1$ //$NON-NLS-2$
***************
*** 50,54 ****
          // We shouldn't need a SearchableBible here because all of these should
          // complete without any searching being done.
!         engine = new LocalParser();
          // FIXME: These fail because the the engine is not initialized with a valid index.
          engine.init(null);
--- 50,54 ----
          // We shouldn't need a SearchableBible here because all of these should
          // complete without any searching being done.
!         engine = new IndexSearcher();
          // FIXME: These fail because the the engine is not initialized with a valid index.
          engine.init(null);
***************
*** 62,115 ****
      public void testAddCommandWord() throws Exception
      {
!         assertEquals(engine.search(new Search("t1", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t2", false)).getName(), "Deu 28:1-1Sa 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("/t1", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("/t2", false)).getName(), "Deu 28:1-1Sa 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("|t1", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("|t2", false)).getName(), "Deu 28:1-1Sa 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
      }

      public void testRetainCommandWord() throws Exception
      {
!         assertEquals(engine.search(new Search("t2&t1", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t1&t2", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t2+t1", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t1+t2", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t2,t1", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t1,t2", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
      }

      public void testRemoveCommandWord() throws Exception
      {
!         assertEquals(engine.search(new Search("t2-t1", false)).getName(), "Deu 28-Rut 1, Rut 3:1-1Sa 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t1-t2", false)).getName(), ""); //$NON-NLS-1$ //$NON-NLS-2$
      }

      public void testBlurCommandWord() throws Exception
      {
!         assertEquals(engine.search(new Search("t3 ~1", false)).getName(), "Mar 2:2-4"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t3 ~2", false)).getName(), "Mar 2:1-5"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t3 ~3", false)).getName(), "Mar 2:1-6"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t3 ~4", false)).getName(), "Mar 2:1-7"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t3 ~5", false)).getName(), "Mar 2:1-8"); //$NON-NLS-1$ //$NON-NLS-2$
      }

      public void testStartsParamWord() throws Exception
      {
!         //assertEquals(engine.search(new Search("startswith joshu", false)), engine.search(new Search("joshua", false)));
!         //assertEquals(engine.search(new Search("sw joshu", false)), engine.search(new Search("joshua", false)));
      }

      public void testSubXParamWord() throws Exception
      {
!         assertEquals(engine.search(new Search("t3 / ( t2 )", false)).getName(), "Deu 28:1-1Sa 1:1, Mar 2:3"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t3/(t2)", false)).getName(), "Deu 28:1-1Sa 1:1, Mar 2:3"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t1 & t2 | t3", false)).getName(), "Rut 2, Mar 2:3"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t1 & t2 - t3", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("( t1 & t2 ) | t3", false)).getName(), "Rut 2, Mar 2:3"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t1 & ( t2 | t3 )", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t1 & ( t2 | t3 ) & ( t3 | t2 )", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t1&(t2|t3)&(t3|t2)", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search(new Search("t1&(t2|(t3))&(t3|t2)", false)).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
      }

--- 62,115 ----
      public void testAddCommandWord() throws Exception
      {
!         assertEquals(engine.search("t1", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t2", Search.UNRESTRICTED).getName(), "Deu 28:1-1Sa 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("/t1", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("/t2", Search.UNRESTRICTED).getName(), "Deu 28:1-1Sa 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("|t1", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("|t2", Search.UNRESTRICTED).getName(), "Deu 28:1-1Sa 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
      }

      public void testRetainCommandWord() throws Exception
      {
!         assertEquals(engine.search("t2&t1", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t1&t2", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t2+t1", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t1+t2", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t2,t1", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t1,t2", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
      }

      public void testRemoveCommandWord() throws Exception
      {
!         assertEquals(engine.search("t2-t1", Search.UNRESTRICTED).getName(), "Deu 28-Rut 1, Rut 3:1-1Sa 1:1"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t1-t2", Search.UNRESTRICTED).getName(), ""); //$NON-NLS-1$ //$NON-NLS-2$
      }

      public void testBlurCommandWord() throws Exception
      {
!         assertEquals(engine.search("t3 ~1", Search.UNRESTRICTED).getName(), "Mar 2:2-4"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t3 ~2", Search.UNRESTRICTED).getName(), "Mar 2:1-5"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t3 ~3", Search.UNRESTRICTED).getName(), "Mar 2:1-6"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t3 ~4", Search.UNRESTRICTED).getName(), "Mar 2:1-7"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t3 ~5", Search.UNRESTRICTED).getName(), "Mar 2:1-8"); //$NON-NLS-1$ //$NON-NLS-2$
      }

      public void testStartsParamWord() throws Exception
      {
!         //assertEquals(engine.search("startswith joshu", Search.UNRESTRICTED), engine.search("joshua", Search.UNRESTRICTED));
!         //assertEquals(engine.search("sw joshu", Search.UNRESTRICTED), engine.search("joshua", Search.UNRESTRICTED));
      }

      public void testSubXParamWord() throws Exception
      {
!         assertEquals(engine.search("t3 / ( t2 )", Search.UNRESTRICTED).getName(), "Deu 28:1-1Sa 1:1, Mar 2:3"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t3/(t2)", Search.UNRESTRICTED).getName(), "Deu 28:1-1Sa 1:1, Mar 2:3"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t1 & t2 | t3", Search.UNRESTRICTED).getName(), "Rut 2, Mar 2:3"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t1 & t2 - t3", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("( t1 & t2 ) | t3", Search.UNRESTRICTED).getName(), "Rut 2, Mar 2:3"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t1 & ( t2 | t3 )", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t1 & ( t2 | t3 ) & ( t3 | t2 )", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t1&(t2|t3)&(t3|t2)", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
!         assertEquals(engine.search("t1&(t2|(t3))&(t3|t2)", Search.UNRESTRICTED).getName(), "Rut 2"); //$NON-NLS-1$ //$NON-NLS-2$
      }

***************
*** 131,136 ****
      public void testUpdatePassage() throws Exception
      {
!         //assertEquals(engine.search(new Search("grammar joseph", false)), engine.search(new Search("joseph / joseph's", false)));
!         //assertEquals(engine.search(new Search("new Search(gr joseph", false)), engine.search(new Search("joseph / joseph's", false)));
      }
  }
\ No newline at end of file
--- 131,136 ----
      public void testUpdatePassage() throws Exception
      {
!         //assertEquals(engine.search("grammar joseph", Search.UNRESTRICTED), engine.search("joseph / joseph's", Search.UNRESTRICTED));
!         //assertEquals(engine.search("gr joseph", Search.UNRESTRICTED), engine.search("joseph / joseph's", Search.UNRESTRICTED));
      }
  }
\ No newline at end of file

Index: ParserTest.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jswordtest/org/crosswire/jsword/book/search/parse/ParserTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ParserTest.java	16 Aug 2004 22:08:44 -0000	1.6
--- ParserTest.java	29 Sep 2004 22:21:23 -0000	1.7
***************
*** 49,74 ****
          // We shouldn't need a SearchableBible here because all of these should
          // fail before any searching is done.
!         LocalParser engine = new LocalParser();
          // FIXME: These fail because the the engine is not initialized with a valid index.
          engine.init(null);

           //try { engine.search(new Search("moses aaron", false)); fail(); } catch (BookException ex) { }
!         try { engine.search(new Search("(", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search("~", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search(")", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search("&", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search(",", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search("+", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search("-", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search("/", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search("|", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search("sw", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search("startswith", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search("gr", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(new Search("grammar", false)); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         //try { engine.search(new Search("moses ( aaron )", false)); fail(); } catch (BookException ex) { }
!         //try { engine.search(new Search("moses & ( aaron", false)); fail(); } catch (BookException ex) { }
!         //try { engine.search(new Search("moses & ( aaron", false)); fail(); } catch (BookException ex) { }
!         //try { engine.search(new Search("( moses ( aaron ) )", false)); fail(); } catch (BookException ex) { }
      }

--- 49,74 ----
          // We shouldn't need a SearchableBible here because all of these should
          // fail before any searching is done.
!         IndexSearcher engine = new IndexSearcher();
          // FIXME: These fail because the the engine is not initialized with a valid index.
          engine.init(null);

           //try { engine.search(new Search("moses aaron", false)); fail(); } catch (BookException ex) { }
!         try { engine.search("(", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search("~", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(")", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search("&", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search(",", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search("+", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search("-", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search("/", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search("|", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search("sw", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search("startswith", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search("gr", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         try { engine.search("grammar", Search.UNRESTRICTED); fail(); } catch (BookException ex) { } //$NON-NLS-1$
!         //try { engine.search("moses ( aaron )", Search.UNRESTRICTED); fail(); } catch (BookException ex) { }
!         //try { engine.search("moses & ( aaron", Search.UNRESTRICTED); fail(); } catch (BookException ex) { }
!         //try { engine.search("moses & ( aaron", Search.UNRESTRICTED); fail(); } catch (BookException ex) { }
!         //try { engine.search("( moses ( aaron ) )", Search.UNRESTRICTED); fail(); } catch (BookException ex) { }
      }

***************
*** 78,82 ****
          version = new FileBible();
          commands = Options.getSearchHashtable();
!         engine = new Parser(version, commands);

          PassageTally tally = engine.bestMatch("for god so loved the world that he gave his one and only son");
--- 78,82 ----
          version = new FileBible();
          commands = Options.getSearchHashtable();
!         engine = new Searcher(version, commands);

          PassageTally tally = engine.bestMatch("for god so loved the world that he gave his one and only son");

Index: DictionaryTest.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jswordtest/org/crosswire/jsword/book/search/parse/DictionaryTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DictionaryTest.java	9 Apr 2004 13:39:10 -0000	1.3
--- DictionaryTest.java	29 Sep 2004 22:21:23 -0000	1.4
***************
*** 2,5 ****
--- 2,7 ----
  package org.crosswire.jsword.book.search.parse;

+ import org.crosswire.jsword.book.search.Grammar;
+ 
  import junit.framework.TestCase;

Index: FixtureParamWord.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jswordtest/org/crosswire/jsword/book/search/parse/FixtureParamWord.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FixtureParamWord.java	27 Jul 2004 21:42:38 -0000	1.4
--- FixtureParamWord.java	29 Sep 2004 22:21:23 -0000	1.5
***************
*** 20,26 ****

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public String getWord(LocalParser engine) throws BookException
      {
          throw new BookException(new MsgBase("Can't get a word from a startswith command"){}); //$NON-NLS-1$
--- 20,26 ----

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getWord(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public String getWord(IndexSearcher engine) throws BookException
      {
          throw new BookException(new MsgBase("Can't get a word from a startswith command"){}); //$NON-NLS-1$
***************
*** 28,34 ****

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getPassage(org.crosswire.jsword.book.search.parse.Parser)
       */
!     public Key getKeyList(LocalParser engine)
      {
          try
--- 28,34 ----

      /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.parse.ParamWord#getPassage(org.crosswire.jsword.book.search.parse.Searcher)
       */
!     public Key getKeyList(IndexSearcher engine)
      {
          try

From jswordcvs at crosswire.org  Wed Sep 29 15:21:26 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:30 2004
Subject: [jsword-svn] 
	jsword/java/jsword/org/crosswire/jsword/book/search/lucene s
Message-ID: <200409292221.i8TMLQCi008562@www.crosswire.org>

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

Modified Files:
	Msg.java Msg.properties 
Added Files:
	LuceneIndex.java 
Removed Files:
	LuceneSearchEngine.java 
Log Message:
Fixes for [JS-7] and [JS-6]
Lots of search work and re-factoring

--- NEW FILE: LuceneIndex.java ---
package org.crosswire.jsword.book.search.lucene;

import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.net.URL;
import java.util.Iterator;

import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Hits;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Searcher;
import org.crosswire.common.activate.Activatable;
import org.crosswire.common.activate.Activator;
import org.crosswire.common.activate.Lock;
import org.crosswire.common.progress.Job;
import org.crosswire.common.util.Logger;
import org.crosswire.common.util.NetUtil;
import org.crosswire.common.util.Reporter;
import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.book.BookData;
import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.book.search.Index;
import org.crosswire.jsword.book.search.IndexManager;
import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.KeyUtil;
import org.crosswire.jsword.passage.NoSuchKeyException;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.PassageTally;
import org.crosswire.jsword.passage.Verse;
import org.crosswire.jsword.passage.VerseFactory;
import org.crosswire.jsword.util.Project;

/**
 * Implement the SearchEngine using Lucene as the search engine.
 *
 * 

 * 
 *
 * Distribution Licence:

 * JSword is free software; you can redistribute it
 * and/or modify it under the terms of the GNU General Public License,
 * version 2 as published by the Free Software Foundation.

 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.

 * The License is available on the internet
 * here, or by writing to:
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 * MA 02111-1307, USA

 * The copyright to this program is held by it's authors.
 * 
 * @see gnu.gpl.Licence
 * @author Joe Walker [joe at eireneh dot com]
 * @version $Id: LuceneIndex.java,v 1.1 2004/09/29 22:21:24 joe Exp $
 */
public class LuceneIndex implements Index, Activatable
{
    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.SearchEngine#init(org.crosswire.jsword.book.Bible, java.net.URL)
     */
    public void init(Book newBook) throws BookException
    {
        try
        {
            book = newBook;

            String driverName = book.getBookMetaData().getDriverName();
            String bookName = book.getBookMetaData().getInitials();

            assert driverName != null;
            assert bookName != null;

            URL base = Project.instance().getTempScratchSpace(DIR_LUCENE, false);
            URL driver = NetUtil.lengthenURL(base, driverName);
            url = NetUtil.lengthenURL(driver, bookName);

            if (isIndexed())
            {
                // Opening Lucene indexes is quite quick I think, so we can try
                // it to see if it works to report errors that we want to drop
                // later
                searcher = new IndexSearcher(NetUtil.getAsFile(url).getCanonicalPath());
            }
        }
        catch (IOException ex)
        {
            throw new BookException(Msg.LUCENE_INIT, ex);
        }
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.SearchEngine#findKeyList(org.crosswire.jsword.book.Search)
     */
    public Key findWord(String search) throws BookException
    {
        checkActive();

        PassageTally tally = new PassageTally();

        if (search != null)
        {
            if (searcher != null)
            {
                try
                {
                    Analyzer analyzer = new StandardAnalyzer();
                    Query query = QueryParser.parse(search, LuceneIndex.FIELD_BODY, analyzer);
                    Hits hits = searcher.search(query);

                    for (int i = 0; i < hits.length(); i++)
                    {
                        Verse verse = VerseFactory.fromString(hits.doc(i).get(LuceneIndex.FIELD_NAME));
                        int score = (int) (hits.score(i) * 100);
                        tally.add(verse, score);
                    }
                }
                catch (Exception ex)
                {
                    throw new BookException(Msg.SEARCH_FAILED, ex);
                }
            }
            else
            {
                log.warn("Missing searcher, skipping search for: "+search); //$NON-NLS-1$
            }
        }

        return tally;
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.Index#getKey(java.lang.String)
     */
    public Key getKey(String name) throws NoSuchKeyException
    {
        return book.getKey(name);
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.SearchEngine#delete()
     */
    public void delete() throws BookException
    {
        checkActive();

        try
        {
            NetUtil.delete(url);
        }
        catch (IOException ex)
        {
            throw new BookException(Msg.DELETE_FAILED, ex);
        }
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.AbstractIndex#isIndexed()
     */
    public boolean isIndexed()
    {
        if (generating)
        {
            return false;
        }

        URL longer = NetUtil.lengthenURL(url, DIR_SEGMENTS);
        return NetUtil.isFile(longer);
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.AbstractIndex#generateSearchIndex(org.crosswire.common.progress.Job)
     */
    public void generateSearchIndex(Job job) throws IOException, BookException
    {
        // An index is created by opening an IndexWriter with the
        // create argument set to true.
        IndexWriter writer = new IndexWriter(NetUtil.getAsFile(url), new StandardAnalyzer(), true);

        generateSearchIndexImpl(job, writer, book.getGlobalKeyList());

        job.setProgress(95, Msg.OPTIMIZING.toString());

        writer.optimize();
        writer.close();

        searcher = new IndexSearcher(NetUtil.getAsFile(url).getCanonicalPath());
    }

    /**
     * Dig down into a Key indexing as we go.
     */
    private void generateSearchIndexImpl(Job job, IndexWriter writer, Key key) throws BookException, IOException
    {
        int percent = 0;
        for (Iterator it = key.iterator(); it.hasNext(); )
        {
            Key subkey = (Key) it.next();
            if (subkey.canHaveChildren())
            {
                generateSearchIndexImpl(job, writer, subkey);
            }
            else
            {
                BookData data = book.getData(subkey);
                Reader reader = new StringReader(data.getPlainText());

                Document doc = new Document();
                doc.add(Field.Text(FIELD_NAME, subkey.getName()));
                doc.add(Field.Text(FIELD_BODY, reader));

                writer.addDocument(doc);

                // report progress
                String name = ""; //$NON-NLS-1$
                Verse verse = KeyUtil.getVerse(subkey);

                try
                {
                    percent = 95 * verse.getOrdinal() / BibleInfo.versesInBible();
                    name = BibleInfo.getLongBookName(verse.getBook());
                }
                catch (NoSuchVerseException ex)
                {
                    log.error("Failed to get book name from verse: "+verse, ex); //$NON-NLS-1$
                    assert false;
                    name = subkey.getName();
                }

                job.setProgress(percent, Msg.INDEXING.toString(name));

                // This could take a long time ...
                Thread.yield();
                if (Thread.currentThread().isInterrupted())
                {
                    break;
                }
            }
        }
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.SearchEngine#activate()
     */
    public final void activate(Lock lock)
    {
        // Load the ascii Passage index
        if (isIndexed())
        {
            try
            {
                searcher = new IndexSearcher(NetUtil.getAsFile(url).getCanonicalPath());
            }
            catch (IOException ex)
            {
                log.warn("second load failure", ex); //$NON-NLS-1$
            }
        }
        else
        {
            IndexManager.instance().createIndex(this);
        }

        active = true;
    }

    /* (non-Javadoc)
     * @see org.crosswire.jsword.book.search.SearchEngine#deactivate()
     */
    public final void deactivate(Lock lock)
    {
        try
        {
            searcher.close();
            searcher = null;
        }
        catch (IOException ex)
        {
            Reporter.informUser(this, ex);
        }

        active = false;
    }

    /**
     * Helper method so we can quickly activate ourselves on access
     */
    protected final void checkActive()
    {
        if (!active)
        {
            Activator.activate(this);
        }
    }

    /**
     * Are we active
     */
    private boolean active = false;

    /**
     * The log stream
     */
    private static final Logger log = Logger.getLogger(LuceneIndex.class);

    /**
     * Are we in the middle of generating an index?
     */
    private boolean generating = false;

    /**
     * The lucene search index directory
     */
    protected static final String DIR_LUCENE = "lucene"; //$NON-NLS-1$

    /**
     * The segments directory
     */
    protected static final String DIR_SEGMENTS = "segments"; //$NON-NLS-1$

    /**
     * The Lucene field for the verse name
     */
    protected static final String FIELD_NAME = "name"; //$NON-NLS-1$

    /**
     * The Lucene field for the verse contents
     */
    protected static final String FIELD_BODY = "body"; //$NON-NLS-1$

    /**
     * The Book that we are indexing
     */
    protected Book book;

    /**
     * The location of this index
     */
    private URL url;

    /**
     * The Lucene search engine
     */
    protected Searcher searcher;
}

--- LuceneSearchEngine.java DELETED ---

Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/Msg.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Msg.properties	14 Jun 2004 05:27:22 -0000	1.1
--- Msg.properties	29 Sep 2004 22:21:24 -0000	1.2
***************
*** 6,11 ****
  # It should have no spaces or other punctuation (e.g. _, -, ', ...)

! LuceneSearchEngine.LuceneInit=Failed to initialise Lucene search engine.
! LuceneSearchEngine.SearchFailed=Search failed.
! LuceneSearchEngine.Indexing=Indexing verse: 
! LuceneSearchEngine.Optimizing=Optimizing
--- 6,12 ----
  # It should have no spaces or other punctuation (e.g. _, -, ', ...)

! LuceneIndex.LuceneInit=Failed to initialise Lucene search engine.
! LuceneIndex.SearchFailed=Search failed.
! LuceneIndex.Indexing=Creating index. Processing {0}
! LuceneIndex.Optimizing=Optimizing
! LuceneIndex.DeleteFailed=Failed to delete search index

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/search/lucene/Msg.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Msg.java	13 Jun 2004 22:12:32 -0000	1.8
--- Msg.java	29 Sep 2004 22:21:24 -0000	1.9
***************
*** 29,36 ****
  class Msg extends MsgBase
  {
!     static final Msg LUCENE_INIT = new Msg("LuceneSearchEngine.LuceneInit"); //$NON-NLS-1$
!     static final Msg SEARCH_FAILED = new Msg("LuceneSearchEngine.SearchFailed"); //$NON-NLS-1$
!     static final Msg INDEXING = new Msg("LuceneSearchEngine.Indexing"); //$NON-NLS-1$
!     static final Msg OPTIMIZING = new Msg("LuceneSearchEngine.Optimizing"); //$NON-NLS-1$

      /**
--- 29,37 ----
  class Msg extends MsgBase
  {
!     static final Msg LUCENE_INIT = new Msg("LuceneIndex.LuceneInit"); //$NON-NLS-1$
!     static final Msg SEARCH_FAILED = new Msg("LuceneIndex.SearchFailed"); //$NON-NLS-1$
!     static final Msg INDEXING = new Msg("LuceneIndex.Indexing"); //$NON-NLS-1$
!     static final Msg OPTIMIZING = new Msg("LuceneIndex.Optimizing"); //$NON-NLS-1$
!     static final Msg DELETE_FAILED = new Msg("LuceneIndex.DeleteFailed"); //$NON-NLS-1$

      /**

From jswordcvs at crosswire.org  Wed Sep 29 15:21:26 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:30 2004
Subject: [jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/sword  s
Message-ID: <200409292221.i8TMLQ7t008555@www.crosswire.org>

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

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

Index: SwordDictionary.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/SwordDictionary.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** SwordDictionary.java	8 Sep 2004 19:55:07 -0000	1.36
--- SwordDictionary.java	29 Sep 2004 22:21:23 -0000	1.37
***************
*** 54,58 ****
      {
          setBookMetaData(sbmd);
-         initSearchEngine();

          this.sbmd = sbmd;
--- 54,57 ----

Index: SwordBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/SwordBook.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SwordBook.java	16 Aug 2004 22:08:43 -0000	1.13
--- SwordBook.java	29 Sep 2004 22:21:23 -0000	1.14
***************
*** 46,50 ****
      {
          setBookMetaData(sbmd);
-         initSearchEngine();

          this.sbmd = sbmd;
--- 46,49 ----

From jswordcvs at crosswire.org  Wed Sep 29 15:21:26 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Wed Sep 29 15:21:30 2004
Subject: [jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/basic s
Message-ID: <200409292221.i8TMLQqF008539@www.crosswire.org>

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

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

Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/Msg.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Msg.properties	15 Jun 2004 23:08:43 -0000	1.1
--- Msg.properties	29 Sep 2004 22:21:24 -0000	1.2
***************
*** 7,10 ****
--- 7,11 ----

  AbstractBookDriver.DriverReadonly=This Book is read-only.
+ AbstractBookDriver.IndexFail=Failed to initialize the search index
  PassageAbstractBook.FilterFail=Filtering input data failed.
  Verifier.Start=Copying Bible data to new driver

Index: AbstractBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/AbstractBook.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AbstractBook.java	21 Sep 2004 17:46:23 -0000	1.9
--- AbstractBook.java	29 Sep 2004 22:21:24 -0000	1.10
***************
*** 1,18 ****
  package org.crosswire.jsword.book.basic;

- import java.net.URL;
- 
  import org.crosswire.common.activate.Lock;
  import org.crosswire.common.util.ClassUtil;
- import org.crosswire.common.util.Reporter;
  import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.Search;
! import org.crosswire.jsword.book.search.SearchEngine;
! import org.crosswire.jsword.book.search.SearchEngineFactory;
! import org.crosswire.jsword.passage.DefaultKeyList;
  import org.crosswire.jsword.passage.Key;
- import org.crosswire.jsword.util.Project;

  /**
--- 1,19 ----
  package org.crosswire.jsword.book.basic;

  import org.crosswire.common.activate.Lock;
  import org.crosswire.common.util.ClassUtil;
  import org.crosswire.jsword.book.Book;
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.Search;
! import org.crosswire.jsword.book.search.Index;
! import org.crosswire.jsword.book.search.IndexFactory;
! import org.crosswire.jsword.book.search.Matcher;
! import org.crosswire.jsword.book.search.MatcherFactory;
! import org.crosswire.jsword.book.search.Searcher;
! import org.crosswire.jsword.book.search.SearcherFactory;
! import org.crosswire.jsword.book.search.Thesaurus;
! import org.crosswire.jsword.book.search.ThesaurusFactory;
  import org.crosswire.jsword.passage.Key;

  /**
***************
*** 74,106 ****
      }

!     /**
!      * Called by our children if we need to initialise a SearchEngine
       */
!     protected void initSearchEngine()
      {
          try
          {
!             URL url = Project.instance().getTempScratchSpace(getBookMetaData().getDriverName() + "-" + getBookMetaData().getInitials(), false); //$NON-NLS-1$
!             searcher = SearchEngineFactory.createSearchEngine(this, url);
!         }
!         catch (Exception ex)
!         {
!             searcher = null;
!             Reporter.informUser(this, ex);
!         }
!     }

!     /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.Book#find(org.crosswire.jsword.book.Search)
!      */
!     public Key find(Search match) throws BookException
!     {
!         if (searcher != null)
!         {
!             return searcher.findKeyList(match);
          }
!         else
          {
!             return new DefaultKeyList();
          }
      }
--- 75,117 ----
      }

!     /* (non-Javadoc)
!      * @see org.crosswire.jsword.book.search.Searcher#search(org.crosswire.jsword.book.Search)
       */
!     public Key find(Search search) throws BookException
      {
          try
          {
!             if (index == null)
!             {
!                 index = IndexFactory.getIndexForBook(this);
!             }

!             if (thesaurus == null)
!             {
!                 thesaurus = ThesaurusFactory.createThesaurus();
!             }
! 
!             if (search.isBestMatch())
!             {
!                 if (matcher == null)
!                 {
!                     matcher = MatcherFactory.createMatcher(index, thesaurus);
!                 }
! 
!                 return matcher.bestMatch(search.getMatch(), search.getRestriction());
!             }
!             else
!             {
!                 if (searcher == null)
!                 {
!                     searcher = SearcherFactory.createSearcher(index);
!                 }
! 
!                 return searcher.search(search.getMatch(), search.getRestriction());
!             }
          }
!         catch (InstantiationException ex)
          {
!             throw new BookException(Msg.INDEX_FAIL);
          }
      }
***************
*** 115,121 ****

      /**
!      * The search implementation
       */
!     private SearchEngine searcher;

      /**
--- 126,147 ----

      /**
!      * The global thesaurus
       */
!     private Thesaurus thesaurus;
! 
!     /**
!      * The search index for this book
!      */
!     private Index index;
! 
!     /**
!      * How do we perform best matches
!      */
!     private Matcher matcher;
! 
!     /**
!      * How do we perform searches
!      */
!     private Searcher searcher;

      /**

Index: Verifier.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/Verifier.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Verifier.java	16 Aug 2004 22:08:45 -0000	1.26
--- Verifier.java	29 Sep 2004 22:21:24 -0000	1.27
***************
*** 11,15 ****
  import org.crosswire.jsword.book.BookException;
  import org.crosswire.jsword.book.Search;
- import org.crosswire.jsword.book.search.Index;
  import org.crosswire.jsword.passage.BibleInfo;
  import org.crosswire.jsword.passage.Key;
--- 11,14 ----
***************
*** 197,245 ****
       * Read from the given source version to generate ourselves
       */
-     public void checkPassage(String starts, PrintWriter out) throws BookException
-     {
-         if (starts == null || starts.equals("")) //$NON-NLS-1$
-         {
-             checkPassage(out);
-             return;
-         }
- 
-         if (!(book1 instanceof Index))
-         {
-             return;
-         }
- 
-         Job job = JobManager.createJob(Msg.VERIFY_PASSAGES.toString(), Thread.currentThread(), false);
-         int count = 0;
-         int percent = -1;
- 
-         // For every word in the word list
-         Index index1 = (Index) book1;
-         Iterator it = index1.getStartsWith(starts).iterator();
-         while (it.hasNext())
-         {
-             String s = (String) it.next();
-             checkSinglePassage(s, out);
- 
-             // Fire a progress event?
-             int newpercent = 100 * count++ / GUESS_WORDS;
-             if (percent != newpercent)
-             {
-                 percent = newpercent;
-                 job.setProgress(percent, Msg.VERIFY_WORDS.toString());
-             }
- 
-             // This could take a long time ...
-             Thread.yield();
-             if (Thread.currentThread().isInterrupted())
-             {
-                 break;
-             }
-         }
-     }
- 
-     /**
-      * Read from the given source version to generate ourselves
-      */
      private void checkSinglePassage(String word, PrintWriter out) throws BookException
      {
--- 196,199 ----

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/Msg.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Msg.java	13 Jun 2004 22:12:33 -0000	1.8
--- Msg.java	29 Sep 2004 22:21:24 -0000	1.9
***************
*** 30,33 ****
--- 30,34 ----
  {
      static final Msg DRIVER_READONLY = new Msg("AbstractBookDriver.DriverReadonly"); //$NON-NLS-1$
+     static final Msg INDEX_FAIL = new Msg("AbstractBookDriver.IndexFail"); //$NON-NLS-1$
      static final Msg FILTER_FAIL = new Msg("PassageAbstractBook.FilterFail"); //$NON-NLS-1$
      static final Msg VERIFY_START = new Msg("Verifier.Start"); //$NON-NLS-1$

From jswordcvs at crosswire.org  Thu Sep 30 15:33:34 2004
From: jswordcvs at crosswire.org (jswordcvs@crosswire.org)
Date: Thu Sep 30 15:33:36 2004
Subject: [jsword-svn] 
	bibledesktop/java/main/org/crosswire/bibledesktop/book s
Message-ID: <200409302233.i8UMXYWR026260@www.crosswire.org>

Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book
In directory www.crosswire.org:/tmp/cvs-serv26251/java/main/org/crosswire/bibledesktop/book

Modified Files:
	Msg.properties DisplaySelectPane.java Msg.java 
	DisplaySelectPane.properties 
Log Message:
select update

Index: DisplaySelectPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DisplaySelectPane.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DisplaySelectPane.java	8 Sep 2004 19:57:58 -0000	1.12
--- DisplaySelectPane.java	30 Sep 2004 22:33:32 -0000	1.13
***************
*** 2,10 ****

  import java.awt.BorderLayout;
! import java.awt.CardLayout;
! import java.awt.Component;
  import java.awt.GridBagConstraints;
  import java.awt.GridBagLayout;
  import java.awt.Insets;
  import java.awt.Toolkit;
  import java.awt.event.ItemEvent;
--- 2,11 ----

  import java.awt.BorderLayout;
! import java.awt.Color;
! import java.awt.Font;
  import java.awt.GridBagConstraints;
  import java.awt.GridBagLayout;
  import java.awt.Insets;
+ import java.awt.SystemColor;
  import java.awt.Toolkit;
  import java.awt.event.ItemEvent;
***************
*** 15,20 ****
  import java.util.List;

! import javax.swing.Action;
! import javax.swing.ButtonGroup;
  import javax.swing.JButton;
  import javax.swing.JCheckBox;
--- 16,21 ----
  import java.util.List;

! import javax.swing.BorderFactory;
! import javax.swing.ImageIcon;
  import javax.swing.JButton;
  import javax.swing.JCheckBox;
***************
*** 23,27 ****
  import javax.swing.JOptionPane;
  import javax.swing.JPanel;
- import javax.swing.JRadioButton;
  import javax.swing.JTextField;

--- 24,27 ----
***************
*** 29,32 ****
--- 29,33 ----
  import org.crosswire.bibledesktop.passage.KeyChangeListener;
  import org.crosswire.common.swing.ActionFactory;
+ import org.crosswire.common.swing.GuiUtil;
  import org.crosswire.common.util.Reporter;
  import org.crosswire.jsword.book.Book;
***************
*** 70,74 ****
      public DisplaySelectPane()
      {
!         init();
      }

--- 71,75 ----
      public DisplaySelectPane()
      {
!         initialize();
      }

***************
*** 76,80 ****
       * Initialize the GUI
       */
!     private void init()
      {
          title = Msg.UNTITLED.toString(new Integer(base++));
--- 77,81 ----
       * Initialize the GUI
       */
!     private void initialize()
      {
          title = Msg.UNTITLED.toString(new Integer(base++));
***************
*** 82,150 ****
          actions = new ActionFactory(DisplaySelectPane.class, this);

-         // Create a way for selecting how passages are found
-         JPanel pnlSelect = new JPanel(new GridBagLayout());
- 
-         // Layout the card picker and the Bible picker side by side
-         pnlSelect.add(createRadioPanel(), new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE,
-                         new Insets(0, 2, 0, 2), 0, 0));
-         pnlSelect.add(createBiblePicker(), new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0,
-                         2, 0, 2), 0, 0));
- 
-         // Create a deck of "cards" for the different ways of finding passages
-         layCards = new CardLayout();
-         pnlCards = new JPanel(layCards);
- 
-         pnlCards.add(createPassagePanel(), PASSAGE);
-         pnlCards.add(createSearchPanel(), SEARCH);
-         pnlCards.add(createMatchPanel(), MATCH);
- 
-         this.setLayout(new BorderLayout());
-         this.add(pnlSelect, BorderLayout.PAGE_START);
-         this.add(pnlCards, BorderLayout.CENTER);
- 
-     }
- 
-     /**
-      *
-      */
-     private Component createRadioPanel()
-     {
-         // These buttons control which "card" in the deck is shown
-         rdoPassg = new JRadioButton(actions.getAction(PASSAGE_OPTIONS));
-         rdoMatch = new JRadioButton(actions.getAction(MATCH_OPTIONS));
-         rdoSearch = new JRadioButton(actions.getAction(SEARCH_OPTIONS));
- 
-         ButtonGroup grpType = new ButtonGroup();
-         grpType.add(rdoPassg);
-         grpType.add(rdoSearch);
-         grpType.add(rdoMatch);
- 
-         JPanel pnlRadios = new JPanel();
-         pnlRadios.add(rdoPassg, null);
-         pnlRadios.add(rdoSearch, null);
-         pnlRadios.add(rdoMatch, null);
-         rdoPassg.setSelected(true);
- 
-         return pnlRadios;
-     }
- 
-     /**
-      *
-      */
-     private Component createBiblePicker()
-     {
-         // Create the Bible picker
          // search() and version() rely on this returning only Bibles
!         mdlVersn = new BooksComboBoxModel(BookFilters.getBibles());
!         JComboBox cboVersn = new JComboBox(mdlVersn);
!         Object selected = mdlVersn.getSelectedItem();
          if (selected != null)
          {
!             cboVersn.setToolTipText(selected.toString());
          }
!         cboVersn.setRenderer(new BookListCellRenderer());
!         // Allow for layout to size the combo box
!         cboVersn.setPrototypeDisplayValue(" "); //$NON-NLS-1$
!         cboVersn.addItemListener(new ItemListener()
          {
              public void itemStateChanged(ItemEvent ev)
--- 83,96 ----
          actions = new ActionFactory(DisplaySelectPane.class, this);

          // search() and version() rely on this returning only Bibles
!         mdlBible = new BooksComboBoxModel(BookFilters.getBibles());
!         JComboBox cboBible = new JComboBox(mdlBible);
!         Object selected = mdlBible.getSelectedItem();
          if (selected != null)
          {
!             cboBible.setToolTipText(selected.toString());
          }
!         cboBible.setRenderer(new BookListCellRenderer());
!         cboBible.addItemListener(new ItemListener()
          {
              public void itemStateChanged(ItemEvent ev)
***************
*** 158,174 ****
              }
          });
!         return cboVersn;
!     }

!     /**
!      *
!      */
!     private Component createPassagePanel()
!     {
!         JLabel label = actions.createJLabel(VIEW_LABEL);

!         txtPassg = new JTextField();
!         txtPassg.setAction(actions.getAction(PASSAGE_FIELD));
!         txtPassg.addKeyListener(new KeyAdapter()
          {
              public void keyTyped(KeyEvent ev)
--- 104,125 ----
              }
          });
!         JLabel lblBible = new JLabel();
!         lblBible.setText(Msg.SELECT_BIBLE.toString());
!         lblBible.setLabelFor(cboBible);

!         JButton btnMenu = new JButton();
!         btnMenu.setIcon(ICON_MENU);
!         btnMenu.setBorderPainted(false);

!         JPanel pnlBible = new JPanel();
!         pnlBible.setLayout(new BorderLayout());
!         pnlBible.add(lblBible, BorderLayout.WEST);
!         pnlBible.add(cboBible, BorderLayout.CENTER);
!         pnlBible.add(btnMenu, BorderLayout.EAST);
! 
!         JLabel lblKey = actions.createJLabel(VIEW_LABEL);
!         txtKey = new JTextField();
!         txtKey.setAction(actions.getAction(PASSAGE_FIELD));
!         txtKey.addKeyListener(new KeyAdapter()
          {
              public void keyTyped(KeyEvent ev)
***************
*** 180,261 ****
              }
          });

-         JButton btnDialg = new JButton(actions.getAction(MORE));
- 
-         JButton goButton = new JButton(actions.getAction(GO_PASSAGE));
- 
-         JPanel panel = new JPanel(new GridBagLayout());
- 
-         panel.add(label, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 2, 2, 2), 0, 0));
-         panel.add(txtPassg, new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 2, 2, 2), 0, 0));
-         panel.add(goButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 2, 2, 2), 0, 0));
-         panel.add(btnDialg, new GridBagConstraints(1, 1, 2, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
- 
-         return panel;
-     }
- 
-     /**
-      *
-      */
-     private Component createSearchPanel()
-     {
          txtSearch = new JTextField();
          txtSearch.setAction(actions.getAction(SEARCH_FIELD));

!         JLabel label = actions.createJLabel(SEARCH_LABEL);
!         label.setLabelFor(txtSearch);
! 
!         chkSRestrict = new JCheckBox(actions.getAction(RESTRICT_SEARCH));
!         chkSRestrict.setSelected(false);
! 
!         txtSRestrict = new JTextField();
!         Action action = actions.getAction(SEARCH_RESTRICTION);
!         txtSRestrict.setAction(action);
!         txtSRestrict.setText(action.getValue(Action.NAME).toString());
! 
!         JButton goButton = new JButton(actions.getAction(GO_SEARCH));
! 
!         JPanel panel = new JPanel(new GridBagLayout());
! 
!         panel.add(label, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 2, 2, 2), 0, 0));
!         panel.add(txtSearch, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 2, 2, 2), 0, 0));
!         panel.add(goButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 2, 2, 2), 0, 0));
!         panel.add(chkSRestrict, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
!         panel.add(txtSRestrict, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2),
!                         0, 0));
! 
!         return panel;
!     }
! 
!     /**
!      *
!      */
!     private Component createMatchPanel()
!     {
!         txtMatch = new JTextField();
!         txtMatch.setAction(actions.getAction(MATCH_FIELD));
! 
!         JLabel label = actions.createJLabel(MATCH_LABEL);
!         label.setLabelFor(txtMatch);
! 
!         txtMRestrict = new JTextField();
!         Action action = actions.getAction(MATCH_RESTRICTION);
!         txtMRestrict.setAction(action);
!         txtMRestrict.setText(action.getValue(Action.NAME).toString());

!         chkMRestrict = new JCheckBox(actions.getAction(RESTRICT_MATCH));
!         chkMRestrict.setSelected(false);

!         JButton goButton = new JButton(actions.getAction(GO_MATCH));

!         JPanel panel = new JPanel(new GridBagLayout());

!         panel.add(label, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 2, 2, 2), 0, 0));
!         panel.add(txtMatch, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 2, 2, 2), 0, 0));
!         panel.add(goButton, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 2, 2, 2), 0, 0));
!         panel.add(chkMRestrict, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
!         panel.add(txtMRestrict, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0));

!         return panel;
      }

--- 131,176 ----
              }
          });
+         JButton btnKey = new JButton(actions.getAction(MORE));
+         btnKey.setIcon(ICON_SELECT);
+         btnKey.setBorderPainted(false);
+         JButton btnKeyGo = new JButton(actions.getAction(GO_PASSAGE));

          txtSearch = new JTextField();
          txtSearch.setAction(actions.getAction(SEARCH_FIELD));
+         JLabel lblSearch = actions.createJLabel(SEARCH_LABEL);
+         lblSearch.setLabelFor(txtSearch);
+         JButton btnSearch = new JButton(actions.getAction(GO_SEARCH));

!         JButton btnHelp = new JButton();
!         btnHelp.setBorderPainted(true);
!         btnHelp.setBorder(BorderFactory.createLineBorder(SystemColor.control, 5));
!         btnHelp.setBackground(Color.yellow);
!         btnHelp.setFont(btnHelp.getFont().deriveFont(Font.BOLD));
!         btnHelp.setIcon(ICON_HELP);

!         JButton btnAdvanced = new JButton();
!         btnAdvanced.setText(Msg.SELECT_ADVANCED.toString());
!         btnAdvanced.setMnemonic(KeyEvent.VK_V);
!         btnAdvanced.setBorderPainted(true);
!         btnAdvanced.setIcon(ICON_SEARCH);
!         btnAdvanced.setBorderPainted(false);

!         chkMatch = new JCheckBox();
!         chkMatch.setText(Msg.SELECT_MATCH.toString());

!         this.setLayout(new GridBagLayout());
!         this.add(pnlBible, new GridBagConstraints(0, 0, 6, 1, 1.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));

!         this.add(lblKey, new GridBagConstraints(0, 1, 2, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));
!         this.add(txtKey, new GridBagConstraints(2, 1, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(3, 0, 0, 0), 0, 0));
!         this.add(btnKey, new GridBagConstraints(4, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(btnKeyGo, new GridBagConstraints(5, 1, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));

!         this.add(btnHelp, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(lblSearch, new GridBagConstraints(1, 2, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0));
!         this.add(txtSearch, new GridBagConstraints(2, 2, 1, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(chkMatch, new GridBagConstraints(3, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(btnAdvanced, new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0));
!         this.add(btnSearch, new GridBagConstraints(5, 2, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 2, 2, 2), 0, 0));
      }

***************
*** 265,272 ****
      public Book getBook()
      {
!         BookMetaData bmd = mdlVersn.getSelectedBookMetaData();
          return bmd != null ? bmd.getBook() : null;
      }

      public void clear()
      {
--- 180,190 ----
      public Book getBook()
      {
!         BookMetaData bmd = mdlBible.getSelectedBookMetaData();
          return bmd != null ? bmd.getBook() : null;
      }

+     /**
+      * 
+      */
      public void clear()
      {
***************
*** 276,291 ****
          }

!         txtPassg.setText(""); //$NON-NLS-1$
!         flipOption(PASSAGE);
! 
!         Action action = actions.getAction(SEARCH_RESTRICTION);
          txtSearch.setText(""); //$NON-NLS-1$
-         txtSRestrict.setText(action.getValue(Action.NAME).toString());
-         chkSRestrict.setSelected(false);
- 
-         action = actions.getAction(MATCH_RESTRICTION);
-         txtMatch.setText(""); //$NON-NLS-1$
-         txtMRestrict.setText(action.getValue(Action.NAME).toString());
-         chkMRestrict.setSelected(false);

          title = Msg.UNTITLED.toString(new Integer(base++));
--- 194,199 ----
          }

!         txtKey.setText(""); //$NON-NLS-1$
          txtSearch.setText(""); //$NON-NLS-1$

          title = Msg.UNTITLED.toString(new Integer(base++));
***************
*** 295,298 ****
--- 203,209 ----
      }

+     /**
+      * 
+      */
      public boolean isClear()
      {
***************
*** 300,326 ****
      }

!     // The following are behaviors associated with the actions executed by actionPerformed
!     public void doPassageOption()
!     {
!         flipOption(PASSAGE);
!     }
! 
!     public void doMatchOption()
!     {
!         flipOption(MATCH);
!     }
! 
!     public void doSearchOption()
!     {
!         flipOption(SEARCH);
!     }
! 
!     private void flipOption(String toWhat)
!     {
!         layCards.show(pnlCards, toWhat);
!         adjustFocus();
!     }
! 
!     // More (...) button was clicked
      public void doMore()
      {
--- 211,217 ----
      }

!     /**
!      * More (...) button was clicked
!      */
      public void doMore()
      {
***************
*** 328,332 ****
      }

!     // Go button was clicked
      public void doGoPassage()
      {
--- 219,225 ----
      }

!     /**
!      * Go button was clicked
!      */
      public void doGoPassage()
      {
***************
*** 334,338 ****
      }

!     // Go button was clicked
      public void doGoSearch()
      {
--- 227,233 ----
      }

!     /**
!      * Go button was clicked
!      */
      public void doGoSearch()
      {
***************
*** 340,361 ****
      }

-     // Enter was hit in txtRestrict
-     public void doSearchEverywhere()
-     {
-         doSearchAction();
-     }
- 
-     // Go button was clicked
-     public void doGoMatch()
-     {
-         doMatchAction();
-     }
- 
-     // Enter was hit in txtMRestrict
-     public void doMatchAnywhere()
-     {
-         doMatchAction();
-     }
- 
      /**
       * Someone pressed return in the passage area
--- 235,238 ----
***************
*** 363,367 ****
      public void doPassageAction()
      {
!         setTitle(txtPassg.getText());
          updateDisplay();
      }
--- 240,244 ----
      public void doPassageAction()
      {
!         setTitle(txtKey.getText());
          updateDisplay();
      }
***************
*** 372,376 ****
      public void doSearchAction()
      {
!         BookMetaData bmd = mdlVersn.getSelectedBookMetaData();
          if (bmd == null)
          {
--- 249,253 ----
      public void doSearchAction()
      {
!         BookMetaData bmd = mdlBible.getSelectedBookMetaData();
          if (bmd == null)
          {
***************
*** 383,429 ****
              String param = txtSearch.getText();
              Book book = bmd.getBook();

!             Search search = new Search(param, false);
!             if (chkSRestrict.isSelected())
!             {
!                 Key restrict = book.getKey(txtSRestrict.getText());
!                 search.setRestriction(restrict);
!             }
! 
!             Key key = book.find(search);
! 
!             txtPassg.setText(key.getName());
!             setTitle(param);
!             updateDisplay();
!         }
!         catch (Exception ex)
!         {
!             Reporter.informUser(this, ex);
!         }
!     }
! 
!     /**
!      * Someone pressed return in the match area
!      */
!     public void doMatchAction()
!     {
!         BookMetaData bmd = mdlVersn.getSelectedBookMetaData();
!         if (bmd == null)
!         {
!             noBookInstalled();
!             return;
!         }
! 
!         try
!         {
!             String param = txtMatch.getText();
!             Book book = bmd.getBook();
! 
!             Search search = new Search(param, true);
!             if (chkMRestrict.isSelected())
!             {
!                 Key restrict = book.getKey(txtMRestrict.getText());
!                 search.setRestriction(restrict);
!             }

              Key key = book.find(search);
--- 260,266 ----
              String param = txtSearch.getText();
              Book book = bmd.getBook();
+             boolean match = chkMatch.isSelected();

!             Search search = new Search(param, match);

              Key key = book.find(search);
***************
*** 437,442 ****
              }

!             txtPassg.setText(key.getName());
! 
              setTitle(param);
              updateDisplay();
--- 274,278 ----
              }

!             txtKey.setText(key.getName());
              setTitle(param);
              updateDisplay();
***************
*** 449,476 ****

      /**
-      * Some on (un)checked the restrict match box
-      */
-     public void doRestrictMatch()
-     {
-         boolean selected = chkMRestrict.isSelected();
-         txtMRestrict.setEnabled(selected);
-     }
- 
-     /**
-      * Some on (un)checked the restrict search box
-      */
-     public void doRestrictSearch()
-     {
-         boolean selected = chkSRestrict.isSelected();
-         txtSRestrict.setEnabled(selected);
- 
-     }
- 
-     /**
       * Sync the viewed passage with the passage text box
       */
      private void updateDisplay()
      {
!         BookMetaData bmd = mdlVersn.getSelectedBookMetaData();
          if (bmd == null)
          {
--- 285,293 ----

      /**
       * Sync the viewed passage with the passage text box
       */
      private void updateDisplay()
      {
!         BookMetaData bmd = mdlBible.getSelectedBookMetaData();
          if (bmd == null)
          {
***************
*** 482,486 ****
          {
              Book book = bmd.getBook();
!             Key key = book.getKey(txtPassg.getText());

              fireCommandMade(new DisplaySelectEvent(this, key, book));
--- 299,303 ----
          {
              Book book = bmd.getBook();
!             Key key = book.getKey(txtKey.getText());

              fireCommandMade(new DisplaySelectEvent(this, key, book));
***************
*** 501,516 ****
      public void adjustFocus()
      {
-         if (rdoPassg.isSelected())
-         {
-             txtPassg.grabFocus();
-         }
-         else if (rdoSearch.isSelected())
-         {
-             txtSearch.grabFocus();
-         }
-         else if (rdoMatch.isSelected())
-         {
-             txtMatch.grabFocus();
-         }
      }

--- 318,321 ----
***************
*** 536,543 ****
      public void setText(String text)
      {
!         String currentText = txtPassg.getText();
          if (!currentText.equals(text))
          {
!             txtPassg.setText(text);
              setTitle(text);
              updateDisplay();
--- 341,348 ----
      public void setText(String text)
      {
!         String currentText = txtKey.getText();
          if (!currentText.equals(text))
          {
!             txtKey.setText(text);
              setTitle(text);
              updateDisplay();
***************
*** 550,554 ****
      protected void changeVersion()
      {
!         BookMetaData bmd = mdlVersn.getSelectedBookMetaData();
          if (bmd == null)
          {
--- 355,359 ----
      protected void changeVersion()
      {
!         BookMetaData bmd = mdlBible.getSelectedBookMetaData();
          if (bmd == null)
          {
***************
*** 560,564 ****
          {
              Book book = bmd.getBook();
!             Key key = book.getKey(txtPassg.getText());

              fireVersionChanged(new DisplaySelectEvent(this, key, book));
--- 365,369 ----
          {
              Book book = bmd.getBook();
!             Key key = book.getKey(txtKey.getText());

              fireVersionChanged(new DisplaySelectEvent(this, key, book));
***************
*** 588,593 ****
              dlgSelect = new PassageSelectionPane();
          }
!         String passg = dlgSelect.showInDialog(this, Msg.SELECT_PASSAGE_TITLE.toString(), true, txtPassg.getText());
!         txtPassg.setText(passg);
          doPassageAction();
      }
--- 393,398 ----
              dlgSelect = new PassageSelectionPane();
          }
!         String passg = dlgSelect.showInDialog(this, Msg.SELECT_PASSAGE_TITLE.toString(), true, txtKey.getText());
!         txtKey.setText(passg);
          doPassageAction();
      }
***************
*** 666,674 ****
      }

-     // Enumeration of all the keys to known actions
-     private static final String PASSAGE_OPTIONS = "PassageOption"; //$NON-NLS-1$
-     private static final String MATCH_OPTIONS = "MatchOption"; //$NON-NLS-1$
-     private static final String SEARCH_OPTIONS = "SearchOption"; //$NON-NLS-1$
- 
      // For the Passage card
      private static final String VIEW_LABEL = "ViewLabel"; //$NON-NLS-1$
--- 471,474 ----
***************
*** 679,697 ****
      // for the Search card
      private static final String SEARCH_LABEL = "SearchLabel"; //$NON-NLS-1$
-     private static final String RESTRICT_SEARCH = "RestrictSearch"; //$NON-NLS-1$
      private static final String GO_SEARCH = "GoSearch"; //$NON-NLS-1$
      private static final String SEARCH_FIELD = "SearchAction"; //$NON-NLS-1$
-     private static final String SEARCH_RESTRICTION = "SearchEverywhere"; //$NON-NLS-1$
- 
-     // for the Match card
-     private static final String MATCH_LABEL = "MatchLabel"; //$NON-NLS-1$
-     private static final String RESTRICT_MATCH = "RestrictMatch"; //$NON-NLS-1$
-     private static final String GO_MATCH = "GoMatch"; //$NON-NLS-1$
-     private static final String MATCH_FIELD = "MatchAction"; //$NON-NLS-1$
-     private static final String MATCH_RESTRICTION = "MatchAnywhere"; //$NON-NLS-1$
- 
-     private static final String PASSAGE = "p"; //$NON-NLS-1$
-     private static final String SEARCH = "s"; //$NON-NLS-1$
-     private static final String MATCH = "m"; //$NON-NLS-1$

      private static int base = 1;
--- 479,484 ----
***************
*** 701,721 ****
      private transient List listeners;

!     private BooksComboBoxModel mdlVersn;
      private PassageSelectionPane dlgSelect;
-     private JTextField txtPassg;
-     private JTextField txtSearch;
-     protected JCheckBox chkSRestrict;
-     protected JTextField txtSRestrict;
-     private JTextField txtMatch;
-     protected JCheckBox chkMRestrict;
-     protected JTextField txtMRestrict;
-     private JRadioButton rdoMatch;
-     private JRadioButton rdoSearch;
-     private JRadioButton rdoPassg;
-     private JPanel pnlCards;
-     private CardLayout layCards;

      private ActionFactory actions;

      /**
       * SERIALUID(dms): A placeholder for the ultimate version id.
--- 488,511 ----
      private transient List listeners;

!     private static final ImageIcon ICON_SEARCH = GuiUtil.getIcon("toolbarButtonGraphics/general/Find16.gif"); //$NON-NLS-1$
! 
!     private static final ImageIcon ICON_SELECT = GuiUtil.getIcon("toolbarButtonGraphics/general/Edit16.gif"); //$NON-NLS-1$
! 
!     private static final ImageIcon ICON_HELP = GuiUtil.getIcon("toolbarButtonGraphics/general/ContextualHelp16.gif"); //$NON-NLS-1$
! 
!     private static final ImageIcon ICON_MENU = GuiUtil.getIcon("toolbarButtonGraphics/general/Preferences16.gif"); //$NON-NLS-1$
! 
!     private BooksComboBoxModel mdlBible;
! 
      private PassageSelectionPane dlgSelect;

      private ActionFactory actions;

+     private JTextField txtKey;
+ 
+     private JTextField txtSearch;
+ 
+     private JCheckBox chkMatch = null;
+ 
      /**
       * SERIALUID(dms): A placeholder for the ultimate version id.
***************
*** 723,725 ****
      private static final long serialVersionUID = 1L;
  }
- 
--- 513,514 ----

Index: DisplaySelectPane.properties
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DisplaySelectPane.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DisplaySelectPane.properties	30 Aug 2004 09:26:13 -0000	1.4
--- DisplaySelectPane.properties	30 Sep 2004 22:33:32 -0000	1.5
***************
*** 1,39 ****

- # for the Passage Lookup radio button
- PassageOption.Enabled=true
- PassageOption.Name=Passage Lookup
- PassageOption.ShortDescription=Passage Lookup
- PassageOption.LongDescription=Passage Lookup
- PassageOption.SmallIcon=
- PassageOption.LargeIcon=
- PassageOption.MnemonicKey=P
- PassageOption.AcceleratorKey=
- PassageOption.AcceleratorKey.Modifiers=
- 
- # for the Match radio button
- MatchOption.Enabled=true
- MatchOption.Name=Match
- MatchOption.ShortDescription=Match
- MatchOption.LongDescription=Match
- MatchOption.SmallIcon=
- MatchOption.LargeIcon=
- MatchOption.MnemonicKey=M
- MatchOption.AcceleratorKey=
- MatchOption.AcceleratorKey.Modifiers=
- 
- # for the Search radio button
- SearchOption.Enabled=true
- SearchOption.Name=Search
- SearchOption.ShortDescription=Search
- SearchOption.LongDescription=Search
- SearchOption.SmallIcon=
- SearchOption.LargeIcon=
- SearchOption.MnemonicKey=S
- SearchOption.AcceleratorKey=
- SearchOption.AcceleratorKey.Modifiers=
- 
  # for the Passage label
  ViewLabel.Enabled=true
! ViewLabel.Name=View:
  ViewLabel.ShortDescription=
  ViewLabel.LongDescription=
--- 1,6 ----

  # for the Passage label
  ViewLabel.Enabled=true
! ViewLabel.Name=Show Passage:
  ViewLabel.ShortDescription=
  ViewLabel.LongDescription=
***************
*** 98,123 ****
  #	verses containting Amminadab within 1 verse of mention of Perez.

- # for the Search restriction check box
- RestrictSearch.Enabled=true
- RestrictSearch.Name=Restrict to:
- RestrictSearch.ShortDescription=Restrict the search to the provided passages
- RestrictSearch.LongDescription=
- RestrictSearch.SmallIcon=
- RestrictSearch.LargeIcon=
- RestrictSearch.MnemonicKey=R
- RestrictSearch.AcceleratorKey=
- RestrictSearch.AcceleratorKey.Modifiers=
- 
- # for the Search restriction text field
- SearchEverywhere.Enabled=false
- SearchEverywhere.Name=Gen-Rev
- SearchEverywhere.ShortDescription=Restrict searching to these passages
- SearchEverywhere.LongDescription=
- SearchEverywhere.SmallIcon=
- SearchEverywhere.LargeIcon=
- SearchEverywhere.MnemonicKey=
- SearchEverywhere.AcceleratorKey=
- SearchEverywhere.AcceleratorKey.Modifiers=
- 
  # for the Search go button
  GoSearch.Enabled=true
--- 65,68 ----
***************
*** 131,179 ****
  GoSearch.AcceleratorKey.Modifiers=

! # for the Match label
! MatchLabel.Name=Find Verses Like:
! MatchLabel.MnemonicKey=V
! 
! # for the Match text entry field
! MatchAction.Enabled=true
! MatchAction.Name=Match
! MatchAction.ShortDescription=Find passages like
! MatchAction.LongDescription=Find passages like
! MatchAction.SmallIcon=
! MatchAction.LargeIcon=
! MatchAction.MnemonicKey=
! MatchAction.AcceleratorKey=
! MatchAction.AcceleratorKey.Modifiers=
! 
! # for the Match restriction check box
! RestrictMatch.Enabled=true
! RestrictMatch.Name=Restrict to:
! RestrictMatch.ShortDescription=Restrict the match to the provided passages
! RestrictMatch.LongDescription=
! RestrictMatch.SmallIcon=
! RestrictMatch.LargeIcon=
! RestrictMatch.MnemonicKey=R
! RestrictMatch.AcceleratorKey=
! RestrictMatch.AcceleratorKey.Modifiers=
! 
! # for the Match restriction text field
! MatchAnywhere.Enabled=false
! MatchAnywhere.Name=Gen-Rev
! MatchAnywhere.ShortDescription=Restrict matching to these passages
! MatchAnywhere.LongDescription=
! MatchAnywhere.SmallIcon=
! MatchAnywhere.LargeIcon=
! MatchAnywhere.MnemonicKey=
! MatchAnywhere.AcceleratorKey=
! MatchAnywhere.AcceleratorKey.Modifiers=

! # for the Match go button
! GoMatch.Enabled=true
! GoMatch.Name=Go
! GoMatch.ShortDescription=Match for a passage
! GoMatch.LongDescription=
! GoMatch.SmallIcon=
! GoMatch.LargeIcon=
! GoMatch.MnemonicKey=G
! GoMatch.AcceleratorKey=
! GoMatch.AcceleratorKey.Modifiers=
--- 76,91 ----
  GoSearch.AcceleratorKey.Modifiers=

! # for the Blah label
! BlahLabel.Name=Find Verses Like:
! BlahLabel.MnemonicKey=V

! # for the Blah text entry field
! BlahAction.Enabled=true
! BlahAction.Name=Blah
! BlahAction.ShortDescription=Find passages like
! BlahAction.LongDescription=Find passages like
! BlahAction.SmallIcon=
! BlahAction.LargeIcon=
! BlahAction.MnemonicKey=
! BlahAction.AcceleratorKey=
! BlahAction.AcceleratorKey.Modifiers=

Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/Msg.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msg.properties	28 Sep 2004 22:25:06 -0000	1.5
--- Msg.properties	30 Sep 2004 22:33:32 -0000	1.6
***************
*** 42,43 ****
--- 42,60 ----
  PassageSelectionPane.Error=Error: {0}
  PassageSelectionPane.Summary=Summary: {0}
+ 
+ AdvancedSearchPane.Phrase=Includes this phrase:
+ AdvancedSearchPane.Go=Go
+ AdvancedSearchPane.Select=Select
+ AdvancedSearchPane.Restrict=Restrict search to these verses:
+ AdvancedSearchPane.Heading=Search for verses with the following details
+ AdvancedSearchPane.Excludes=Excludes these words:
+ AdvancedSearchPane.Includes=Includes all these words:
+ 
+ KeySelectPane.Go=Go
+ KeySelectPane.Keys=Select
+ KeySelectPane.Match=Match
+ KeySelectPane.Advanced=Advanced
+ KeySelectPane.Help=\ ?\ 
+ KeySelectPane.Bible=Bible:
+ KeySelectPane.Display=Display:
+ KeySelectPane.Search=Search:

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/Msg.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Msg.java	28 Sep 2004 22:25:06 -0000	1.7
--- Msg.java	30 Sep 2004 22:33:32 -0000	1.8
***************
*** 67,70 ****
--- 67,87 ----
      static final Msg SUMMARY = new Msg("PassageSelectionPane.Summary"); //$NON-NLS-1$

+     static final Msg SEARCH_PHRASE = new Msg("AdvancedSearchPane.Phrase"); //$NON-NLS-1$
+     static final Msg SEARCH_GO = new Msg("AdvancedSearchPane.Go"); //$NON-NLS-1$
+     static final Msg SEARCH_SELECT = new Msg("AdvancedSearchPane.Select"); //$NON-NLS-1$
+     static final Msg SEARCH_RESTRICT = new Msg("AdvancedSearchPane.Restrict"); //$NON-NLS-1$
+     static final Msg SEARCH_HEADING = new Msg("AdvancedSearchPane.Heading"); //$NON-NLS-1$
+     static final Msg SEARCH_EXCLUDES = new Msg("AdvancedSearchPane.Excludes"); //$NON-NLS-1$
+     static final Msg SEARCH_INCLUDES = new Msg("AdvancedSearchPane.Includes"); //$NON-NLS-1$
+ 
+     static final Msg SELECT_GO = new Msg("KeySelectPane.Go"); //$NON-NLS-1$
+     static final Msg SELECT_KEYS = new Msg("KeySelectPane.Keys"); //$NON-NLS-1$
+     static final Msg SELECT_MATCH = new Msg("KeySelectPane.Match"); //$NON-NLS-1$
+     static final Msg SELECT_ADVANCED = new Msg("KeySelectPane.Advanced"); //$NON-NLS-1$
+     static final Msg SELECT_HELP = new Msg("KeySelectPane.Help"); //$NON-NLS-1$
+     static final Msg SELECT_BIBLE = new Msg("KeySelectPane.Bible"); //$NON-NLS-1$
+     static final Msg SELECT_DISPLAY = new Msg("KeySelectPane.Display"); //$NON-NLS-1$
+     static final Msg SELECT_SEARCH = new Msg("KeySelectPane.Search"); //$NON-NLS-1$
+ 
      /**
       * Passthrough ctor

	! The CrossWire Bible Society is an organization with the purpose to sponsor and provide a place for engineers and others to come and collaborate on free, open-source projects aimed at furthering the Kingdom of our God. ! CrossWire is a non-income organization, which means that not only do we offer our services for free, but we also do not solicit donations to exist. We exist because we, as a community come together and offer our services and time freely. !
	! Atlassian supports our efforts by contributing their bug tracking and issue tracking application, JIRA, to our project. ! Atlassian is an innovative Australian software company providing enterprise software solutions to the world's leading organisations. Atlassian's leading software product, JIRA is a bug tracking and issue tracking application developed to track and manage the issues and bugs that emerge during a project. JIRA customers include departments from NASA, Boeing, Cisco, JP Morgan, 3M, BP, Sony and more. Try it for yourself today. !
	! Jakarta Lucene is a high-performance, full-featured text search engine library written entirely in Java. It is a technology suitable for nearly any application that requires full-text search, especially cross-platform. ! Jakarta Lucene is an open source project available for free download from Apache Jakarta. Please use the links on the left to access Lucene. !
	! We intend to provide a solution for using XML from Java that is as simple as Java itself. ! There is no compelling reason for a Java API to manipulate XML to be complex, tricky, unintuitive, or a pain in the neck. JDOM is both Java-centric and Java-optimized. It behaves like Java, it uses Java collections, it is completely natural API for current Java developers, and it provides a low-cost entry point for using XML.

Coding Recommendations

Notes

Coding Recommendations

Notes

JDK Versions

Compiler Settings

JDK Versions

Coding Standards

Coding Standards

Packaging

Packaging

Bracket Indentation

Bracket Indentation

Variable Naming

Variable Naming

Class Ordering

Class Ordering

Tabbing

Tabbing

Preamble

Preamble

Similarity beween Java Sword API and C++ Sword API

Similarity beween Java Sword API and C++ Sword API

New Testament Old Testament

New Testament Old Testament