Login | Register
My pages Projects Community openCollabNet

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

Project highlights: Architectural Overview

joist
Discussion topic

Back to topic list

CVS update: joist/java/org/joist/search SearchSwishe.java

Author stack
Full name Michael Stack
Date 2000-10-24 11:31:28 PDT
Message User: stack
  Date: 00/10/24 11:31:28

  Modified: java/org/joist/search SearchSwishe.java
  Log:
  Clean up trying to make my code narrower on the page
  
  Revision Changes Path
  1.2 +38 -20 joist/java/org/joist​/search/SearchSwishe​.java
  
  Index: SearchSwishe.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/search/SearchS​wishe.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SearchSwishe.java 2000/10/23 23:21:45 1.1
  +++ SearchSwishe.java 2000/10/24 18:31:28 1.2
  @@ -59,7 +59,7 @@
   * in a title or header tag (if it's an HTML file), etc.
   * </p>
   * @author <a href="mailto:stack@c​ollab.net">St.Ack​</a>
  -* @version $Id: SearchSwishe.java,v 1.1 2000/10/23 23:21:45 stack Exp $
  +* @version $Id: SearchSwishe.java,v 1.2 2000/10/24 18:31:28 stack Exp $
   * @see <a href="http://sunsite.berke​ley.edu/SWISH-E/Manu​al">Swish-e Documentation</a>
   */
   public class SearchSwishe
  @@ -68,12 +68,13 @@
       /** Class version string
       */
       public static final String versionID
  - = "$Id: SearchSwishe.java,v 1.1 2000/10/23 23:21:45 stack Exp $";
  + = "$Id: SearchSwishe.java,v 1.2 2000/10/24 18:31:28 stack Exp $";
   
   
       /** Define key for pulling system property DEBUG.
       */
  - public static final String DEBUG_KEY = "DEBUG";
  + public static final String DEBUG_KEY
  + = "DEBUG";
       
   
       /** True if we're in debugging mode
  @@ -84,7 +85,8 @@
       
       /** Use this key to pull query from system properties.
       */
  - public static final String QUERY_PARAM_KEY = "query";
  + public static final String QUERY_PARAM_KEY
  + = "query";
       
       
       /** Search result format version string.
  @@ -97,14 +99,16 @@
       
       /** The swish-e binary.
       */
  - protected java.io.File swisheBinary = null;
  + protected java.io.File swisheBinary
  + = null;
       
   
       /** The Swish-e Result Format Version string we work with.
       * Written as a regular expression in case we do more than
       * one explicit version. Search across multilines.
       */
  - protected gnu.regexp.RE reFormatVersion = null;
  + protected gnu.regexp.RE reFormatVersion
  + = null;
               
       
       /** Regular expression to find header lines.
  @@ -112,17 +116,20 @@
       * across multi-lines so we jump over preamble
       * to get to first header line.
       */
  - protected gnu.regexp.RE reHeaderKeyValues = null;
  + protected gnu.regexp.RE reHeaderKeyValues
  + = null;
           
   
       /** Search result error line Regular Expression.
       */
  - protected gnu.regexp.RE reErrorLine = null;
  + protected gnu.regexp.RE reErrorLine
  + = null;
       
           
       /** The 'No Results' regular expression.
       */
  - protected gnu.regexp.RE reNoResults = null;
  + protected gnu.regexp.RE reNoResults
  + = null;
           
        
        
  @@ -137,43 +144,51 @@
       * to see how swish-e returned it. Swish-e strips all
       * '"' characters from the title
       */
  - protected gnu.regexp.RE reSearchResultLine = null;
  + protected gnu.regexp.RE reSearchResultLine
  + = null;
   
       
       /** Search result header key for index name
       */
  - protected final static String INDEX_NAME = "Name";
  + protected final static String INDEX_NAME
  + = "Name";
       
       
       /** Search result header key for index date
       */
  - protected final static String INDEX_MOD_DATE = "Indexed on";
  + protected final static String INDEX_MOD_DATE
  + = "Indexed on";
       
   
       /** Search result header key for index stats
       */
  - protected final static String INDEX_STATS = "Counts";
  + protected final static String INDEX_STATS
  + = "Counts";
       
       
       /** Search result header key for number of hits
       */
  - protected final static String NUMBER_OF_HITS = "Number of hits";
  + protected final static String NUMBER_OF_HITS
  + = "Number of hits";
       
       
       /** Search result header key for index path.
       * May be an url or full path.
       */
  - protected final static String INDEX_PATH = "Pointer";
  + protected final static String INDEX_PATH
  + = "Pointer";
       
    
       /** Search result header key for description.
       */
  - protected final static String INDEX_DESCRIPTION = "Description";
  + protected final static String INDEX_DESCRIPTION
  + = "Description";
       
       
       /** Search result header key for search engine search words.
       */
  - protected final static String SEARCH_WORDS = "Search words";
  + protected final static String SEARCH_WORDS
  + = "Search words";
       
           
       /** Constructor.
  @@ -216,6 +231,7 @@
               = new gnu.regexp.RE( "(\\d*) ([^\"]*) \\\"(.*)\\\" (\\d*)" );
       }
       
  +
   
      /** Run a search w/ passed in Query.
       *
  @@ -241,9 +257,11 @@
           
           try
           {
  - String swisheSearchResultStr = runSwishe( inQuery );
  - searchresult = parseSearchResult( inQuery,
  - swisheSearchResultStr );
  + String swisheSearchResultStr
  + = runSwishe( inQuery );
  + searchresult
  + = parseSearchResult( inQuery,
  + swisheSearchResultStr );
           }
           
           catch( InterruptedException interruptedException )

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: joist/java/org/joist/search SearchSwishe.java stack Michael Stack 2000-10-24 11:31:28 PDT
Messages per page: