Changeset 33397

Timestamp:

2019-08-11T19:30:49+12:00 (5 years ago)

Author:

ak19

Message:

1. Changing package structure and instructions on compiling/running as there will be more Java classes. 2. Minor fix so that when MaoriDetector is run with min-min-help it doesn't print out the ERROR expecting request to read from filename/stdinput.

File:

• gs3-extensions/maori-lang-detection/src/MaoriTextDetector.java (modified) (3 diffs)

gs3-extensions/maori-lang-detection/src/MaoriTextDetector.java

@@ -19 +19 @@
  */
 
+package org.greenstone.atea;
+
 import java.io.*;
 import opennlp.tools.langdetect.*;
@@ -29 +31 @@
  *
  * Then, to compile this program, do the following from the "src" folder (the folder containing this java file):
- *    maori-lang-detection/src$ javac -cp ".:$OPENNLP_HOME/lib/opennlp-tools-1.9.1.jar" MaoriTextDetector.java
+ *    maori-lang-detection/src$ javac -cp ".:$OPENNLP_HOME/lib/opennlp-tools-1.9.1.jar" org/greenstone/atea/MaoriTextDetector.java
  *
  * To run this program, issue one of the following commands from the "src" folder (the folder containing this java file):
  *
- *    maori-lang-detection/src$ java -cp ".:$OPENNLP_HOME/lib/*" MaoriTextDetector --help
- *
- *    maori-lang-detection/src$ java -cp ".:$OPENNLP_HOME/lib/*" MaoriTextDetector --file <full/path/to/textfile>
- *
- *    maori-lang-detection/src$ java -cp ".:$OPENNLP_HOME/lib/*" MaoriTextDetector -
+ *    maori-lang-detection/src$ java -cp ".:$OPENNLP_HOME/lib/opennlp-tools-1.9.1.jar" org.greenstone.atea.MaoriTextDetector --help
+ *
+ *    maori-lang-detection/src$ java -cp ".:$OPENNLP_HOME/lib/opennlp-tools-1.9.1.jar" org.greenstone.atea.MaoriTextDetector --file <full/path/to/textfile>
+ *
+ *    maori-lang-detection/src$ java -cp ".:$OPENNLP_HOME/lib/opennlp-tools-1.9.1.jar" org.greenstone.atea.MaoriTextDetector -
  *       Press enter. This variant of the program expects text to stream in from standard input.
  *       If entering text manually, then remember to press Ctrl-D to indicate the usual end of StdIn.
@@ -363 +365 @@
     }
 
-    if(!readFromStdIn && inFile == null) { // at least one input source must be provided
-        doPrintErr(runSilent, "ERROR: must specify source to read text from, either STDIN (-) or input file (--file <file>).\n");
-        printUsage = true;
-        returnVal = -1;
-    }
-    
-    if(readFromStdIn && inFile != null) { // this program can't be asked to read from stdin and from an input file
-        doPrintErr(runSilent, "ERROR: instructed to read from both STDIN and from an input file. Not possible.\n");
-        printUsage = true;
-        returnVal = -1;
+    if(returnVal != 2) { // returnVal == 2 for help. Only if the user did not request --help/-h, do we continue to make sure the arguments provided are sane
+        if(!readFromStdIn && inFile == null) { // at least one input source must be provided
+        doPrintErr(runSilent, "ERROR: must specify source to read text from, either STDIN (-) or input file (--file <file>).\n");
+        printUsage = true;
+        returnVal = -1;
+        }
+        
+        if(readFromStdIn && inFile != null) { // this program can't be asked to read from stdin and from an input file
+        doPrintErr(runSilent, "ERROR: instructed to read from both STDIN and from an input file. Not possible.\n");
+        printUsage = true;
+        returnVal = -1;
+        }
     }