Changeset 11308 for trunk/gli

Timestamp:

2006-03-08T10:37:03+13:00 (18 years ago)

Author:

kjdon

Message:

commented out Michael's print statements. Also, in runLocal(), commented out the test for type==NEW - used when checking the output and error streams. if there was an error in mkcol, then on windows this would block and never return.

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GShell.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -276 +276 @@
         }
         
-        System.err.println("Command: "+command);
         ///ystem.err.println("Command: " + command);
         fireMessage(type, Dictionary.get("GShell.Command") + ": " + command, status, null);
@@ -289 +288 @@
         StringBuffer stdline_buffer = new StringBuffer();
     
-        while(type != GShell.NEW && processRunning(prcs) && !hasSignalledStop()) {
+        while(/*type != GShell.NEW &&*/ processRunning(prcs) && !hasSignalledStop()) {
         // Hopefully this doesn't block if the process is trying to write to STDOUT.
         if((eisr!=null) && eisr.ready()) { 
@@ -404 +403 @@
 
     // Issue a processBegun event
-    System.err.println("\nFiring process begun for " + type + "...");
+    //ystem.err.println("\nFiring process begun for " + type + "...");
     fireProcessBegun(type, status);
-    System.err.println("Done process begun.");
+    //ystem.err.println("Done process begun.");
     if (Gatherer.isGsdlRemote) {
         runRemote(args,bos);
@@ -413 +412 @@
         runLocal(args,bos);
     }
-    System.err.println("Done runLocal().");
+    //ystem.err.println("Done runLocal().");
 
     if(status == OK) {
@@ -477 +476 @@
 
     // We're done.  
-    System.err.println("Firing process complete for " + type + "...");
+    //ystem.err.println("Firing process complete for " + type + "...");
     fireProcessComplete(type, status);
     // Close bos
@@ -545 +544 @@
     // Start the progres monitor if available
     if(progress != null) {
-        System.err.println("About to call progress.start().");
+        //ystem.err.println("About to call progress.start().");
         progress.start();
-        System.err.println("Called progress.start().");
+        //ystem.err.println("Called progress.start().");
     }
     // Fire an event