Changeset 4302

Timestamp:

2003-05-23T16:12:49+12:00 (21 years ago)

Author:

jmt12

Message:

bug fix

File:

• trunk/gli/src/org/greenstone/gatherer/Configuration.java (modified) (3 diffs)

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

@@ -55 +55 @@
 public class Configuration
       extends Hashtable {
+     public File exec_file;
      /** The path (or url) to the webserver which is serving the Greenstone collection. */
      public String exec_path = null;
@@ -73 +74 @@
      private int cache_hit = 0;
      private int cache_miss = 0;
-     private URL exec_address = null;
+     public URL exec_address = null;
      /** The string identifying an argument's name attribute. */
      static final private String ARGUMENT_NAME = "name";
@@ -103 +104 @@
           this.gsdl_path = gsdl_path;
           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);
+          if(exec_path != null && exec_path.length() > 0) {
+                try {
+                     // If its missing the protocol add it now.
+                     if(exec_path.indexOf("://") != -1) {
+                          exec_address = new URL(exec_path);
+                     }
+                     else {
+                          exec_address = new URL("http://" + exec_path);
+                     }
+                }
+                catch (MalformedURLException error) {
+                     System.err.println("Not an address.");
+                }
+          }
+          // If the above failed, then its up to us to try and figure out what to do.
+          if(exec_address == null) {
+                // Try building a file from the given exec_path
+                try {
+                     File local_file = new File(exec_path);
+                     if(local_file.exists()) {
+                          // All good. I hope.
+                          exec_file = local_file;
+                     }
+                }
+                // All sorts of errors might be thrown by a bogus file path.
+                catch (Exception error) {
+                     System.err.println("Not a valid file.");
+                }
+                // We can generate the path to where the local library should be and use that if it is there.
+                if(exec_file == null) {
+                     File server_exe = new File(gsdl_path + Utility.SERVER_EXE);
+                     if(server_exe.exists()) {
+                          exec_file = server_exe;
+                     }
+                     else {
+                          System.err.println("No local library.");
+                     }
+                }
+                // If we get to here with no exec_address nor an exec_file its just plain not going to work.
+          }
           this.perl_path = perl_path;
           // Ensure the perl path includes exe under windoze