started rewriting the thing for Solr/Lucene 3.1 usage

2 files changed, 17 insertions, 4 deletions

diff --git a/run.sh b/luceneanalyzer
index bb604c5..bb604c5 100755
--- a/run.sh
+++ b/luceneanalyzer
diff --git a/src/main/java/org/dyndns/andreasbaumann/LuceneAnalyzer.java b/src/main/java/org/dyndns/andreasbaumann/LuceneAnalyzer.java
index 6649a9f..40e325a 100644
--- a/src/main/java/org/dyndns/andreasbaumann/LuceneAnalyzer.java
+++ b/src/main/java/org/dyndns/andreasbaumann/LuceneAnalyzer.java
@@ -57,6 +57,7 @@ import org.apache.lucene.document.Field;
 
 public class LuceneAnalyzer
 {
+	private static final String programName = "lucenanalyzer";
 	private static final String versionString = "0.0.4";
 	
 	private static void printGlobalInfo( IndexReader indexReader ) throws IOException
@@ -200,7 +201,7 @@ public class LuceneAnalyzer
 
 	private static void printUsage()
 	{
-		System.err.println( "Usage: java " + LuceneAnalyzer.class.getName( ) + " <lucene index dir>" );
+		System.err.println( "Usage: " + programName + " [options] <lucene index dir>\n" );
 		for( Iterator i = optionHelpStrings.iterator( ); i.hasNext( ); ) {
 			System.err.println( i.next( ) );
 		}
@@ -222,6 +223,12 @@ public class LuceneAnalyzer
 		                          "print this help message" );
 		Option version = addHelp( parser.addBooleanOption( "version" ),
 		                          "print version information" );
+		Option globals = addHelp( parser.addBooleanOption( 'g', "globals" ),
+		                          "print global statistics" );
+		Option fields =  addHelp( parser.addBooleanOption( 'f', "fields" ),
+		                          "print field information" );
+		Option terms =   addHelp( parser.addBooleanOption( 't', "terms" ),
+		                          "print statistics per term" );
 
 		// read the command line options
 		try {
@@ -275,9 +282,15 @@ public class LuceneAnalyzer
 		Directory luceneDirectory = new SimpleFSDirectory( indexDir );
 		IndexReader indexReader = IndexReader.open( luceneDirectory );
 		
-		printGlobalInfo( indexReader );
-		printFieldInfo( indexReader );
-		printTerms( indexReader, verbosity == 1, verbosity == 2 );
+		if( (Boolean)parser.getOptionValue( globals, Boolean.FALSE ) ) {
+			printGlobalInfo( indexReader );
+		}
+		if( (Boolean)parser.getOptionValue( fields, Boolean.FALSE ) ) {
+			printFieldInfo( indexReader );
+		}
+		if( (Boolean)parser.getOptionValue( terms, Boolean.FALSE ) ) {
+			printTerms( indexReader, verbosity == 1, verbosity == 2 );
+		}
 		
 		indexReader.close( );