Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: joist/java/org/joist/search SearchServletConstants.java SearchServlet.java

Project highlights: Architectural Overview

joist
Discussion topic

Hide all messages in topic

All messages in topic

CVS update: joist/java/org/joist/search SearchServletConstants.java SearchServlet.java

Author stack
Full name Michael Stack
Date 2000-10-30 15:02:32 PST
Message User: stack
  Date: 00/10/30 15:02:32

  Modified: java/org/joist/search SearchServlet.java
  Added: java/org/joist/search SearchServletConstants.java
  Log:
  Moved constants to SearchServletConstants taking them from SearchServlet. Did this because more than one class needs them. Avoid duplication
  
  Revision Changes Path
  1.4 +12 -67 joist/java/org/joist​/search/SearchServle​t.java
  
  Index: SearchServlet.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/search/SearchS​ervlet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SearchServlet.java 2000/10/25 20:31:17 1.3
  +++ SearchServlet.java 2000/10/30 23:02:32 1.4
  @@ -97,15 +97,16 @@
   * </ol>
   *
   * @author <a href="mailto:stack@c​ollab.net">St.Ack​</a>
  -* @version $Id: SearchServlet.java,v 1.3 2000/10/25 20:31:17 stack Exp $
  +* @version $Id: SearchServlet.java,v 1.4 2000/10/30 23:02:32 stack Exp $
   */
   public class SearchServlet
       extends org.joist.security.U​nsecureServlet
  + implements SearchServletConstants
   {
       /** Class version string
       */
       public static final String versionID
  - = "$Id: SearchServlet.java,v 1.3 2000/10/25 20:31:17 stack Exp $";
  + = "$Id: SearchServlet.java,v 1.4 2000/10/30 23:02:32 stack Exp $";
       
       
       /** Logging object.
  @@ -113,69 +114,13 @@
       private Log log
           = new Log( "search", "Simple Search" );
           
  -
  +
       /** Are we in debug state?
       */
  - private static final boolean DEBUG
  + private static final boolean debug
           = true;
       
       
  - /** Property in zone.properties file w/ path to index.
  - * Leave it protected rather than private since it's
  - * read-only anyways.
  - */
  - protected static final String INDEX_PATH
  - = "SWISH_E_INDEX";
  -
  -
  - /** Property in servlet property file w/ path to swishe binary.
  - * Leave it protected rather than private since it's
  - * read-only anyways.
  - */
  - protected static final String BINARY_PATH
  - = "swisheBinary";
  -
  -
  - /** Key to pull 'action' from context w/ getForm( )
  - * Leave it protected rather than private since it's
  - * read-only anyways.
  - */
  - protected static final String ACTION_KEY
  - = "action";
  -
  -
  - /** Key to pull the resultsPerPage from context w/ getForm( )
  - * Leave it protected rather than private since it's
  - * read-only anyways.
  - */
  - protected static final String RESULTS_PER_PAGE_KEY
  - = "resultsPerPage";
  -
  -
  - /** Key to pull the query from context w/ getForm( )
  - * Leave it protected rather than private since it's
  - * read-only anyways.
  - */
  - protected static final String QUERY_KEY
  - = "query";
  -
  -
  - /** The Search action -- the value under our search input button.
  - * Leave it protected rather than private since it's
  - * read-only anyways.
  - */
  - protected static final String SEARCH_ACTION
  - = "Search";
  -
  -
  - /** Key to put searchresult into context with.
  - * Leave it protected rather than private since it's
  - * read-only anyways.
  - */
  - protected static final String SEARCH_RESULT_KEY
  - = "searchresult";
  -
  -
       /** Process search.
        * @param connection A connection to a JDBC database
        * @param context The WebContext partially populated by WMServlet
  @@ -213,7 +158,7 @@
               String action
                   = ( String )context.get( ACTION_KEY );
               
  - if( DEBUG )
  + if( debug )
                   log.debug( "Action: " + action );
               
               
  @@ -222,7 +167,7 @@
               {
                   if( !isValidUserInput( missingFields ) )
                   {
  - if( DEBUG )
  + if( debug )
                           log.debug( "INVALID INPUT: "
                                       + missingFields.toString( ) );
                       reportInvalidUserInput( context, missingFields );
  @@ -230,7 +175,7 @@
                   else
                   {
                       String index = myProperties.getProperty( INDEX_PATH );
  - if(DEBUG)
  + if(debug)
                           log.debug( index );
                           
                       Query objQuery
  @@ -244,7 +189,7 @@
                       SearchResult searchresult
                           = swishe.search( objQuery );
                                       
  - if( DEBUG )
  + if( debug )
                           log.debug( "Number Of Hits: "
                                       + Integer.toString( searchresult.getNumberOfHits( ) ) );
                                       
  @@ -257,14 +202,14 @@
           {
               log.exception( e );
               String message = e.getMessage( );
  - if( DEBUG )
  + if( debug )
                   log.debug( message );
               appendToMessage( context, message );
           }
           
           finally
           {
  - if( DEBUG )
  + if( debug )
                   log.debug( "done" );
           }
           
  @@ -310,7 +255,7 @@
               value = defaultValue;
           }
           context.put(key, value);
  - if( DEBUG )
  + if( debug )
               log.debug( "Processing field: " + key + '=' + value );
           return value;
       }
  
  
  
  1.1 joist/java/org/joist​/search/SearchServle​tConstants.java
  
  Index: SearchServletConstants.java
  ====================​====================​====================​=======
  /* ====================​====================​====================​====
   * Copyright (c) 2000 Collab.Net. All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions are
   * met:
   *
   * 1. Redistributions of source code must retain the above copyright
   * notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   * notice, this list of conditions and the following disclaimer in the
   * documentation and/or other materials provided with the distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   * any, must include the following acknowlegement: "This product includes
   * software developed by Collab.Net (http://www.Collab.Net/)."
   * Alternately, this acknowlegement may appear in the software itself, if
   * and wherever such third-party acknowlegements normally appear.
   *
   * 4. The hosted project names must not be used to endorse or promote
   * products derived from this software without prior written
   * permission. For written permission, please contact info at collab dot net.
   *
   * 5. Products derived from this software may not use the "Tigris" name
   * nor may "Tigris" appear in their names without prior written
   * permission of Collab.Net.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
   * IN NO EVENT SHALL COLLAB.NET OR ITS CONTRIBUTORS BE LIABLE FOR ANY
   * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
   * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
   * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
   * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
   * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
   * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
   * ====================​====================​====================​========
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of Collab.Net.
  */
  package org.joist.search;
  
  
  /** Constants used by search servlets.
  * All are read-only (Static finals).
  * @author <a href="mailto:stack@c​ollab.net">St.Ack​</a>
  * @version $Id: SearchServletConstants.java,v 1.1 2000/10/30 23:02:32 stack Exp $
  * @see org.joist.search.SearchServlet
  */
  public interface SearchServletConstants
  {
      /** Class version string
      */
      public static final String versionID
          = "$Id: SearchServletConstants.java,v 1.1 2000/10/30 23:02:32 stack Exp $";
      
      
      /** Property in zone.properties file w/ path to index.
      */
      public static final String INDEX_PATH
          = "SWISH_E_INDEX";
      
      
      /** Property in servlet property file w/ path to swishe binary.
      */
      public static final String BINARY_PATH
          = "swisheBinary";
      
      
      /** Key to pull 'action' from context w/ getForm( )
      */
      public static final String ACTION_KEY
          = "action";
      
      
      /** Key to pull the resultsPerPage from context w/ getForm( )
      */
      public static final String RESULTS_PER_PAGE_KEY
          = "resultsPerPage";
      
      
      /** Key to pull the query from context w/ getForm( )
      */
      public static final String QUERY_KEY
          = "query";
      
      
      /** The Search action -- the value under our search input button.
      */
      public static final String SEARCH_ACTION
          = "Search";
      
      
      /** Key to put searchresult into context with.
      */
      public static final String SEARCH_RESULT_KEY
          = "searchresult";
  }
Messages per page: