[Sqlshell-svn] /devel/src/main/java/nl/improved/sqlclient

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2009-01-17 16:15:31 +0100 (Sat, 17 Jan 2009)
New Revision: 355

Modified:
   src/main/java/nl/improved/sqlclient/SQLShell.java
Log:
added output result of batch command from commandline call again


Modified: src/main/java/nl/improved/sqlclient/SQLShell.java
===================================================================
--- src/main/java/nl/improved/sqlclient/SQLShell.java	2009-01-17 15:11:40 UTC (rev 354)
+++ src/main/java/nl/improved/sqlclient/SQLShell.java	2009-01-17 15:15:31 UTC (rev 355)
@@ -23,10 +23,12 @@
 import java.io.PrintStream;
 import java.sql.SQLException;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import nl.improved.sqlclient.charva.CharvaSQLShellWindow;
 import nl.improved.sqlclient.commands.Command;
+import nl.improved.sqlclient.commands.CommandResult;
 import nl.improved.sqlclient.jcurses.SQLShellWindow;
 
 
@@ -99,7 +101,7 @@
 
             };
             Command cmd = new nl.improved.sqlclient.AbstractSQLShellWindow.ExecuteBatchCommand(sqlshellWindow);
-            cmd.execute(new SQLCommand("@"+ argsMap.get("-i")));
+            CommandResult result = cmd.execute(new SQLCommand("@"+ argsMap.get("-i")));
             if (argsMap.containsKey("-o")) {
                 File f = new File(argsMap.get("-o"));
                 FileOutputStream fout = new FileOutputStream(f);
@@ -107,8 +109,16 @@
                     fout.write(s.toString().getBytes());
                     fout.write('\n');
                 }
-                //fout.write(output.toString().getBytes());
-                //fout.write('\n');
+                Iterator<CharSequence> iResult = result.getResult();
+                while (iResult.hasNext()) {
+                    fout.write(iResult.next().toString().getBytes());
+                }
+                fout.write('\n');
+            } else {
+                Iterator<CharSequence> iResult = result.getResult();
+                while (iResult.hasNext()) {
+                    System.out.println(iResult.next());
+                }
             }
         } else {
             //sqlshellWindow = new SQLShellWindow();