Add JtsOp output file option

Author: dr-jts

modules/app/src/main/java/org/locationtech/jtstest/cmd/CommandOptions.java

@@ -37,6 +37,7 @@ public class CommandOptions {
   public static final String QUIET = "q";
   public static final String VALIDATE = "validate";
   public static final String WHERE = "where";  
+  public static final String OUTPUT = "o";  
 
   public static final String SOURCE_STDIN = "stdin";
 

modules/app/src/main/java/org/locationtech/jtstest/cmd/CommandOutput.java

@@ -11,49 +11,79 @@
  */
 package org.locationtech.jtstest.cmd;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
 public class CommandOutput {
 
-  private StringBuilder output = new StringBuilder();
+  private StringBuilder outputBuffer = new StringBuilder();
   private boolean isCapture = false;
+  private String outputFilename;
+  private PrintWriter outWriter;
 
   public CommandOutput() {
-    
+    outWriter = new PrintWriter(System.out, true);
   }
 
   public CommandOutput(boolean isCapture) {
     this.isCapture = true;
   }
 
+  public CommandOutput(String outputFile) {
+    this.outputFilename = outputFile;
+    File file = new File(outputFile);
+    FileWriter fw = null;
+    try {
+      fw = new FileWriter(file);
+    } catch (IOException e) {
+      System.err.println(e.getMessage());
+      System.exit(1);
+    }
+    outWriter = new PrintWriter(fw, true);
+  }
+
   public void println() {
     if (isCapture ) {
-      output.append("\n");
+      outputBuffer.append("\n");
     }
     else {
-      System.out.println();
+      outWriter.println();
     }
   }
 
-  public void println(Object o) {
+  public void logln(Object o) {
     if (isCapture ) {
-      output.append(o);
-      output.append("\n");
+      outputBuffer.append(o);
+      outputBuffer.append("\n");
     }
     else {
       System.out.println(o);
     }
   }
 
+  public void println(Object o) {
+    if (isCapture ) {
+      outputBuffer.append(o);
+      outputBuffer.append("\n");
+    }
+    else {
+      outWriter.println(o);
+    }
+  }
+  
   public void print(String s) {
     if (isCapture ) {
-      output.append(s);
+      outputBuffer.append(s);
     }
     else {
-      System.out.print(s);
+      outWriter.print(s);
     }
   }
 
   public String getOutput() {
-    return output.toString();
+    return outputBuffer.toString();
   }
 
 }

modules/app/src/main/java/org/locationtech/jtstest/cmd/JTSOpCmd.java

@@ -123,6 +123,7 @@ private static CommandLine createCmdLine() {
     .addOptionSpec(new OptionSpec(CommandOptions.FORMAT, 1))
     .addOptionSpec(new OptionSpec(CommandOptions.LIMIT, 1))
     .addOptionSpec(new OptionSpec(CommandOptions.OFFSET, 1))
+    .addOptionSpec(new OptionSpec(CommandOptions.OUTPUT, 1))
     .addOptionSpec(new OptionSpec(CommandOptions.REPEAT, 1))
     .addOptionSpec(new OptionSpec(CommandOptions.QUIET, 0))
     .addOptionSpec(new OptionSpec(CommandOptions.SRID, 1))
@@ -153,6 +154,7 @@ private static CommandLine createCmdLine() {
   "           [ -q",
   "           [ -time ]",
   "           [ -v, -verbose ]",
+  "           [ -o filename ]",
   "           [ -help ]",
   "           [ -geomfunc classname ]",
   "           [ -op ]",
@@ -182,6 +184,7 @@ private static CommandLine createCmdLine() {
   "  -explode        output atomic geometries",
   "  -f              output format to use.  Default is txt/wkt",
   "  -q              quiet mode - result is not output",
+  "  -o filename     write result output to filename",
   "===== Logging options:",
   "  -time           display execution time",
   "  -v, -verbose    display information about execution",
@@ -350,6 +353,10 @@ JTSOpRunner.OpParams parseArgs(String[] args) throws ParseException, ClassNotFou
 
     cmdArgs.isQuiet = commandLine.hasOption(CommandOptions.QUIET);
 
+    cmdArgs.outputFile = commandLine.hasOption(CommandOptions.OUTPUT) 
+        ? commandLine.getOptionArg(CommandOptions.OUTPUT, 1)
+        : null;
+
     cmdArgs.repeat = commandLine.hasOption(CommandOptions.REPEAT)
         ? commandLine.getOptionArgAsInt(CommandOptions.REPEAT, 0)
             : 1;

modules/app/src/main/java/org/locationtech/jtstest/cmd/JTSOpRunner.java

@@ -66,8 +66,8 @@ public class JTSOpRunner {
   private boolean captureGeometry = false;
   private List<Geometry> resultGeoms = new ArrayList<Geometry>();
 
-  private CommandOutput out = new CommandOutput();
-  private GeometryOutput geomOut = new GeometryOutput(out);
+  private CommandOutput out;
+  private GeometryOutput geomOut;
   private String symGeom2 = SYM_B;
 
   private IndexedGeometry geomIndexB;
@@ -110,6 +110,8 @@ static class OpParams {
     public int filterOp;
     public double filterVal = 0;
 
+    public String outputFile;
+    
     String operation;
     public String[] argList;
 
@@ -159,9 +161,21 @@ public void replaceStdIn(InputStream inStream) {
   public String getOutput() {
     return out.getOutput();
   }
+  
   void execute(OpParams param) {
     this.param = param;
 
+    //-- init output to file or console
+    if (out == null) {
+      if (param.outputFile != null) {
+        out = new CommandOutput(param.outputFile);
+      }
+      else {
+        out = new CommandOutput();
+      }
+      geomOut = new GeometryOutput(out);
+    }
+    
     geomFactory = createGeometryFactory(param.srid);
     geomA = null;
     geomB = null;
@@ -269,7 +283,7 @@ private void executeFunction() {
     executeFunctionOverA(fun);
 
     if (isVerbose || isTime) {
-      out.println("\nOperation " + func.getCategory() + "." + func.getName() + ": " + opCount
+      out.logln("\nOperation " + func.getCategory() + "." + func.getName() + ": " + opCount
         + " invocations - Total Time: " + Stopwatch.getTimeString( totalTime ));
     }
   }
@@ -314,7 +328,7 @@ private void executeFunction(Geometry geomA, FunctionInvoker fun, String hdr) {
 
       String opDesc = "[" + (opCount+1) + "] -- " + opSummary(func, arg) + " : ";
       if (isVerbose) {
-        out.println(opDesc + hdr);
+        out.logln(opDesc + hdr);
       }
       else {
         hdrSave = hdr + "\n" + opDesc;
@@ -388,8 +402,8 @@ private String toStackString(Throwable ex) {
 
   private void logError(String msg) {
     // this will be blank if already printed in verbose mode
-    out.println(hdrSave);
-    out.println(msg);
+    out.logln(hdrSave);
+    out.logln(msg);
   }
 
   private void validate(Object result) {
@@ -512,7 +526,7 @@ private void printGeometry(Geometry geom, int srid, String outputFormat) {
 
   private void printlnInfo(String s) {
     if (! isVerbose) return;
-    out.println(s);
+    out.logln(s);
   }
 
   private void printGeometrySummary(String label, List<Geometry> geom, String source) {