[jsword-svn] jsword-web/java/main/org/crosswire/jsword/view/web s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword-web/java/main/org/crosswire/jsword/view/web
In directory www.crosswire.org:/tmp/cvs-serv30369/java/main/org/crosswire/jsword/view/web

Modified Files:
	DemoServlet.java 
Log Message:
indexing updates

Index: DemoServlet.java
===================================================================
RCS file: /cvs/jsword/jsword-web/java/main/org/crosswire/jsword/view/web/DemoServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DemoServlet.java	25 Aug 2004 22:53:48 -0000	1.5
--- DemoServlet.java	9 Oct 2004 21:45:31 -0000	1.6
***************
*** 16,20 ****
  import org.crosswire.jsword.book.BookData;
  import org.crosswire.jsword.book.Books;
! import org.crosswire.jsword.book.Search;
  import org.crosswire.jsword.passage.Key;
  import org.crosswire.jsword.passage.Passage;
--- 16,21 ----
  import org.crosswire.jsword.book.BookData;
  import org.crosswire.jsword.book.Books;
! import org.crosswire.jsword.book.search.parse.IndexSearcher;
! import org.crosswire.jsword.book.search.parse.PhraseParamWord;
  import org.crosswire.jsword.passage.Key;
  import org.crosswire.jsword.passage.Passage;
***************
*** 83,87 ****
              {
                  request.setAttribute(FIELD_SEARCH, search);
!                 key = book.find(new Search(search, false));
              }
  
--- 84,88 ----
              {
                  request.setAttribute(FIELD_SEARCH, search);
!                 key = book.find(search);
              }
  
***************
*** 90,94 ****
              {
                  request.setAttribute(FIELD_MATCH, match);
!                 PassageTally tally = (PassageTally) book.find(new Search(match, true));
                  tally.setOrdering(PassageTally.ORDER_TALLY);
                  tally.trimRanges(tallyTrim, RestrictionType.NONE);
--- 91,96 ----
              {
                  request.setAttribute(FIELD_MATCH, match);
!                 String quote = IndexSearcher.getPreferredSyntax(PhraseParamWord.class);
!                 PassageTally tally = (PassageTally) book.find(quote + match + quote);
                  tally.setOrdering(PassageTally.ORDER_TALLY);
                  tally.trimRanges(tallyTrim, RestrictionType.NONE);