organization

bin/git-search

@@ -1,12 +1,19 @@
 #!/bin/sh
 
-GIT_BASE=`git rev-parse --show-toplevel`
+help()
+{
+  echo 'Usage:'
+  echo '  git-search --index'
+  echo '  git-search <search terms>'
+}
+
+REPO_BASE=`git rev-parse --show-toplevel`
 if [ 0 -ne $? ]; then
-  echo $GIT_BASE
+  echo $REPO_BASE
   exit 1
 fi
 
-INDEX="$GIT_BASE/.gitsearch/index"
+INDEX="$REPO_BASE/.gitsearch/index"
 
 SOURCE=$0
 while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
@@ -17,12 +24,10 @@ export CLASSPATH="$GIT_SEARCH_BASE/lucene-core-3.5.0.jar:$GIT_SEARCH_BASE/src"
 
 COMMAND=$1
 
-if [ $COMMAND == 'index' ]; then
-  java org.apache.lucene.demo.IndexFiles -index $INDEX -docs $GIT_BASE
-elif [ $COMMAND == 'query' ]; then
-  java org.apache.lucene.demo.SearchFiles -index $INDEX -query $2
+if [ -z $COMMAND ]; then
+    help
+elif [ $COMMAND == '--index' ]; then
+  java com.github.tenorviol.gitsearch.IndexFiles -index $INDEX -docs $REPO_BASE
 else
-  echo 'Usage:'
-  echo '  git-search index'
-  echo '  git-search query <search terms>'
+  java com.github.tenorviol.gitsearch.SearchFiles -index $INDEX -query $COMMAND
 fi

makefile

@@ -0,0 +1,3 @@
+
+src/com/github/tenorviol/gitsearch/*.class: src/com/github/tenorviol/gitsearch/*.java
+	javac -classpath lucene-core-3.5.0.jar src/com/github/tenorviol/gitsearch/*.java

src/org/apache/lucene/demo/IndexFiles.java → src/com/github/tenorviol/gitsearch/IndexFiles.java

@@ -1,4 +1,4 @@
-package org.apache.lucene.demo;
+package com.github.tenorviol.gitsearch;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more

src/org/apache/lucene/demo/SearchFiles.java → src/com/github/tenorviol/gitsearch/SearchFiles.java

@@ -1,4 +1,4 @@
-package org.apache.lucene.demo;
+package com.github.tenorviol.gitsearch;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,7 +57,7 @@ public static void main(String[] args) throws Exception {
     boolean raw = false;
     String queryString = null;
     int hitsPerPage = 10;
-    
+
     for(int i = 0;i < args.length;i++) {
       if ("-index".equals(args[i])) {
         index = args[i+1];
@@ -85,7 +85,7 @@ public static void main(String[] args) throws Exception {
         i++;
       }
     }
-    
+
     IndexReader reader = IndexReader.open(FSDirectory.open(new File(index)));
     IndexSearcher searcher = new IndexSearcher(reader);
     Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_31);
@@ -112,10 +112,10 @@ public static void main(String[] args) throws Exception {
       if (line.length() == 0) {
         break;
       }
-      
+
       Query query = parser.parse(line);
       System.out.println("Searching for: " + query.toString(field));
-            
+
       if (repeat > 0) {                           // repeat & time as benchmark
         Date start = new Date();
         for (int i = 0; i < repeat; i++) {
@@ -136,28 +136,28 @@ public static void main(String[] args) throws Exception {
   }
 
   /**
-   * This demonstrates a typical paging search scenario, where the search engine presents 
+   * This demonstrates a typical paging search scenario, where the search engine presents
    * pages of size n to the user. The user can then go to the next page if interested in
    * the next hits.
-   * 
+   *
    * When the query is executed for the first time, then only enough results are collected
    * to fill 5 result pages. If the user wants to page beyond this limit, then the query
    * is executed another time and all hits are collected.
-   * 
+   *
    */
-  public static void doPagingSearch(BufferedReader in, IndexSearcher searcher, Query query, 
+  public static void doPagingSearch(BufferedReader in, IndexSearcher searcher, Query query,
                                      int hitsPerPage, boolean raw, boolean interactive) throws IOException {
- 
+
     // Collect enough docs to show 5 pages
     TopDocs results = searcher.search(query, 5 * hitsPerPage);
     ScoreDoc[] hits = results.scoreDocs;
-    
+
     int numTotalHits = results.totalHits;
     System.out.println(numTotalHits + " total matching documents");
 
     int start = 0;
     int end = Math.min(numTotalHits, hitsPerPage);
-        
+
     while (true) {
       if (end > hits.length) {
         System.out.println("Only results 1 - " + hits.length +" of " + numTotalHits + " total matching documents collected.");
@@ -169,9 +169,9 @@ public static void doPagingSearch(BufferedReader in, IndexSearcher searcher, Que
 
         hits = searcher.search(query, numTotalHits).scoreDocs;
       }
-      
+
       end = Math.min(hits.length, start + hitsPerPage);
-      
+
       for (int i = start; i < end; i++) {
         if (raw) {                              // output raw format
           System.out.println("doc="+hits[i].doc+" score="+hits[i].score);
@@ -189,7 +189,7 @@ public static void doPagingSearch(BufferedReader in, IndexSearcher searcher, Que
         } else {
           System.out.println((i+1) + ". " + "No path for this document");
         }
-                  
+
       }
 
       if (!interactive || end == 0) {
@@ -201,13 +201,13 @@ public static void doPagingSearch(BufferedReader in, IndexSearcher searcher, Que
         while (true) {
           System.out.print("Press ");
           if (start - hitsPerPage >= 0) {
-            System.out.print("(p)revious page, ");  
+            System.out.print("(p)revious page, ");
           }
           if (start + hitsPerPage < numTotalHits) {
             System.out.print("(n)ext page, ");
           }
           System.out.println("(q)uit or enter number to jump to a page.");
-          
+
           String line = in.readLine();
           if (line.length() == 0 || line.charAt(0)=='q') {
             quit = true;