Changeset 31578 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build

Timestamp:

2017-04-06T15:24:43+12:00 (7 years ago)

Author:

ak19

Message:

Removed debugging and other minor cosmetic changes after successful Windows testing of the new SafeProcess class used by the modified GS2PerlConstructor.runPerlCommand() method.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build

Files:

• CollectionConstructor.java (modified) (1 diff)
• GS2PerlConstructor.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/CollectionConstructor.java

@@ -25 +25 @@
     protected EventListenerList listeners = null;
     /** A flag used to determine if this process has been asked to cancel. */
-    protected boolean cancel = false;
+    protected boolean cancel = false; // Not really used (in any way that works)
     /** Stores the name of the manifest file (if one is needed) */
     protected String manifest_file = null;
-    /** The URL params constructed as a query string, representing the CGI QUERY_STRING to the process */
-    protected String query_string = null;
+    /** The URL params constructed as a query string, representing the CGI QUERY_STRING to the process */
+    protected String query_string = null;
 
     public CollectionConstructor(String name)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -36 +36 @@
     public static final int BUILD = 2;
     public static final int ACTIVATE = 3;
-    public static final int MODIFY_METADATA_SERVER = 4;
+    public static final int MODIFY_METADATA_SERVER = 4;
 
     /**
@@ -49 +49 @@
     /** the path environment variable */
     protected String path = null;
+
 
     public GS2PerlConstructor(String name)
@@ -409 +410 @@
     sendMessage(new ConstructionEvent(this, GSStatus.INFO, "command = " + command_str));
     
-    
-    logger.info("### Running command = " + command_str);
+    //logger.info("### Running command = " + command_str);
 
     // This is where we create and run our perl process safely
@@ -450 +450 @@
         // std in of java, as before.
 
-        logger.info("**** BEFORE runProcess.");
         perlProcess.runProcess();
-        logger.info("**** AFTER runProcess:");
         
     // The original runPerlCommand() code had an ineffective check for whether the cmd had been cancelled
@@ -545 +543 @@
         }
 
-logger.info("### old runPerlCmd, command = " + command_str);
+        // logger.info("### old runPerlCmd, command = " + command_str);
 
         sendMessage(new ConstructionEvent(this, GSStatus.INFO, "command = " + command_str));