Changeset 8625

Timestamp:

2004-11-23T13:07:15+13:00 (19 years ago)

Author:

mdewsnip

Message:

Changed the old exec_path variable and option to library_url.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (3 diffs)
• Gatherer.java (modified) (4 diffs)
• GathererApplet.java (modified) (1 diff)
• GathererProg.java (modified) (1 diff)
• GetOpt.java (modified) (2 diffs)
• gems/GEMS.java (modified) (1 diff)
• util/StaticStrings.java (modified) (1 diff)

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

@@ -97 +97 @@
     static public Configuration self = null;
 
-    /** The path (or url) to the webserver which is serving the Greenstone collection. */
-    static public String exec_path = null;
     /** The path to the Greenstone Suite installation directory. */
     static public String gsdl_path = "";
@@ -135 +133 @@
     /** Constructor.
      * @param gsdl_path The path to the Greenstone directory as a <strong>String</strong>.
-     * @param exec_path A <strong>String</strong> containing the path or url to the webserver serving the greenstone collections.
+     * @param library_url A <strong>String</strong> containing the url of the Greenstone webserver.
      * @param perl_path The path to the PERL executable, as a <strong>String</strong>.
      * @param mirroring_enabled If true will override the config.xml fiel setting for mirroring.
      * @param site_name The name of the Greenstone 3 site currently in use.
      */
-    public Configuration(String gsdl_path, String gsdl3_path, String exec_path, String perl_path, boolean mirroring_enabled, String site_name) {
+    public Configuration(String gsdl_path, String gsdl3_path, String library_url, String perl_path, boolean mirroring_enabled, String site_name) {
     super();
     self = this;
@@ -146 +144 @@
     this.gsdl_path = gsdl_path;
     this.gsdl3_path = gsdl3_path;
-    this.exec_path = exec_path;
     this.mirroring_enabled = mirroring_enabled;
     this.site_name = site_name;
 
-    // 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.
-    DebugStream.println("EXEC_PATH = " + exec_path);
-    if(exec_path != null && exec_path.length() > 0) {
+    DebugStream.println("Library URL = " + library_url);
+    if (library_url != null && library_url.length() > 0) {
         try {
-        exec_address = new URL(exec_path);
+        exec_address = new URL(library_url);
         }
         catch (MalformedURLException error) {
-        DebugStream.println("Not an address.");
-        // !!! When the Local Library is used on Windows this exception is thrown -- needs to be fixed
-        // DebugStream.printStackTrace(error);
+        DebugStream.printStackTrace(error);
         }
     }

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

@@ -118 +118 @@
 
     public GUIManager init(Dimension size, String gsdl_path, String gsdl3_path, String local_library_path,
-               String exec_path, boolean debug_enabled, String perl_path, 
+               String library_url, boolean debug_enabled, String perl_path, 
                boolean no_load, String open_collection, 
                String site_name, String servlet_path, 
@@ -153 +153 @@
     try {
         // Load Config
-        loadConfig(gsdl_path, gsdl3_path, exec_path, perl_path, mirroring_enabled, site_name);
+        loadConfig(gsdl_path, gsdl3_path, library_url, perl_path, mirroring_enabled, site_name);
 
         // I don't really know what this is for but I've moved it here from Configuration
@@ -609 +609 @@
     /** Loads the configuration file if one exists. Otherwise it creates a new one. Currently uses serialization.
      * @param gsdl_path The path to the gsdl directory, gathered from the startup arguments, and presented as a <strong>String</strong>.
-     * @param exec_path The path to the library executable, gathered from the startup arguments, and presented as a <strong>String</strong>.
+     * @param library_url The path to the library executable, gathered from the startup arguments, and presented as a <strong>String</strong>.
      * @param perl_path The path to the PERL compiler as a <strong>String</strong>. Necessary for windows platform versions.
      * @param mirroring_enabled
@@ -619 +619 @@
      * @see org.greenstone.gatherer.Configuration
      */
-    private void loadConfig(String gsdl_path, String gsdl3_path, String exec_path, String perl_path, boolean mirroring_enabled, String site_name) {
+    private void loadConfig(String gsdl_path, String gsdl3_path, String library_url, String perl_path, boolean mirroring_enabled, String site_name) {
     try {
-        new Configuration(gsdl_path, gsdl3_path, exec_path, perl_path, mirroring_enabled, site_name);
+        new Configuration(gsdl_path, gsdl3_path, library_url, perl_path, mirroring_enabled, site_name);
     }
     catch (Exception error) {

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

@@ -172 +172 @@
 
     g_man = gatherer.init(size, go.gsdl_path, go.gsdl3_path, go.local_library_path,
-                    go.exec_path, go.debug, go.perl_path, 
+                    go.library_url, go.debug, go.perl_path, 
                     go.no_load, go.filename, go.site_name, 
                     go.servlet_path, go.mirroring_enabled, 

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

@@ -91 +91 @@
     GUIManager g_man 
         = gatherer.init(size, go.gsdl_path, go.gsdl3_path, go.local_library_path,
-                 go.exec_path, go.debug, go.perl_path, 
+                 go.library_url, go.debug, go.perl_path, 
                  go.no_load, go.filename, go.site_name, 
                  go.servlet_path, go.mirroring_enabled, 

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

@@ -39 +39 @@
     public boolean no_load = false;
 
-    public String exec_path = null;
     public String extra = null;
     public String filename = null;
     public String gsdl_path = null;
     public String gsdl3_path = null;
+    public String library_url = null;
     public String local_library_path = null;
     public String perl_path = null;
@@ -187 +187 @@
             else if (argument_name.equals(StaticStrings.LOCAL_LIBRARY_ARGUMENT)) {
             local_library_path = argument_value;
-
-//          exec_path = argument_value;
-//          // If there is no colon in first five characters of
-//          // the exec_path (which would either be an existing
-//          // protocol, or a windows file path to say a local
-//          // library), we can append the protocol http://.
-//          if(argument_value.lastIndexOf(StaticStrings.COLON_CHARACTER, 5) == -1) {
-//              exec_path = StaticStrings.HTTP_PROTOCOL_STR + argument_value;
-//          }
-//          else {
-//              exec_path = argument_value;
-//          }
-//          // If the user has given us an address, but it ends
-//          // with a '/' we assume we're using the greenstone
-//          // library.cgi
-//          if(exec_path.startsWith(StaticStrings.HTTP_PROTOCOL_STR) && exec_path.endsWith(StaticStrings.URL_SEPARATOR_CHARACTER)) {
-//              exec_path = exec_path + StaticStrings.LIBRARY_STR;
-//          }
+            }
+            // Manually specify the Greenstone library URL
+            else if (argument_name.equals(StaticStrings.LIBRARY_URL_ARGUMENT)) {
+            library_url = argument_value;
             }
             // Parse the path to PERL. If not provided its assumes

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -190 +190 @@
     try {
            
-        config = new Configuration(go.gsdl_path, null, go.exec_path, go.perl_path, false, null);
+        config = new Configuration(go.gsdl_path, null, null, go.perl_path, false, null);
     }
     catch (Exception exception) {

trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -155 +155 @@
     static final public String LEVELS_ELEMENT                             = "Levels";
     static final public String LEVELS_STR                                 = "levels";
+    static final public String LIBRARY_URL_ARGUMENT                       = "-library_url";
     static final public String LOCAL_LIBRARY_ARGUMENT                     = "-local_library";
-    static final public String LIBRARY_STR                                = "library";
     static final public String LOAD_ARGUMENT                              = "-load";
     static final public String MAC_OPEN_COMMAND                           = "open %1";