Changeset 4556

Timestamp:

2003-06-11T13:41:15+12:00 (21 years ago)

Author:

jmt12

Message:

Directed several debug comments so I can later have them only written out in debug mode.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (3 diffs)
• Gatherer.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -105 +105 @@
     this.exec_path = exec_path;
     // The exec_path may contain an url address, in which case we blindly use that and leave it up to the user to worry about settings and resetting.
-    System.err.println("EXEC_PATH = " + exec_path);
+    Gatherer.println("EXEC_PATH = " + exec_path);
     if(exec_path != null && exec_path.length() > 0) {
         try {
@@ -129 +129 @@
                 // All sorts of errors might be thrown by a bogus file path.
         catch (Exception error) {
-        System.err.println("Not a valid file.");
+        Gatherer.println("Not a valid file.");
         }
                 // We can generate the path to where the local library should be and use that if it is there.
@@ -171 +171 @@
     updateUI();
 
-    System.err.println("EXEC_FILE = " + exec_file);
-    System.err.println("EXEC_ADDRESS = " + exec_address);
+    Gatherer.println("EXEC_FILE = " + exec_file);
+    Gatherer.println("EXEC_ADDRESS = " + exec_address);
     }
 

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -688 +688 @@
     private void startServerEXE() {
     if(config.exec_file != null && config.exec_address == null && Utility.isWindows()) {
-                // First of all we create a GSDLSiteCFG object and check if a URL is already present, in which case the server is already running.
+        // First of all we create a GSDLSiteCFG object and check if a URL is already present, in which case the server is already running.
         gsdlsite_cfg = new GSDLSiteConfig(config.exec_file);
         String url = gsdlsite_cfg.getURL();
-                // If its already running then set exec address.
+        // If its already running then set exec address.
         if(url != null) {
         try {
@@ -699 +699 @@
         }
         }
-                // Otherwise its time to run the server in a spawned process.
+        // Otherwise its time to run the server in a spawned process.
         if(config.exec_address == null && config.exec_file.exists()) {
         // Configure for immediate entry. Note that this only works if the gsdlsite.cfg file exists.
@@ -722 +722 @@
         }
         }
-                // Can't do a damb thing.
-    }
-    System.err.println("Having started server.exe, exec_address is: " + config.exec_address);
+        // Can't do a damb thing.
+    }
+    Gatherer.println("Having started server.exe, exec_address is: " + config.exec_address);
     }