Changeset 10540

Timestamp:

2005-08-19T13:40:25+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added a "-use_remote_greenstone" argument, and added the "gliserver_url" argument to the configRemote.xml file.

Location:

trunk/gli

Files:

• classes/dictionary.properties (modified) (1 diff)
• classes/xml/configRemote.xml (modified) (3 diffs)
• src/org/greenstone/gatherer/Configuration.java (modified) (2 diffs)
• src/org/greenstone/gatherer/Gatherer.java (modified) (6 diffs)
• src/org/greenstone/gatherer/GathererApplet.java (modified) (1 diff)
• src/org/greenstone/gatherer/GetOpt.java (modified) (2 diffs)
• src/org/greenstone/gatherer/util/StaticStrings.java (modified) (1 diff)

trunk/gli/classes/dictionary.properties

@@ -770 +770 @@
 MissingEXEC_GS3.Message:Warning! You will not be able to view your new collections within the Librarian Interface unless you specify the path to the Greenstone context in the locally running Tomcat Webserver. You can enter this now in the text field below, or later by going to Preferences and choosing the Connection tab. Remember that a valid url must start with the protocol "http://". The default address is http://localhost:8080/gsdl3.
 MissingEXEC_GS3.Title:Missing Greenstone Library Address
+#***** Missing GLIServer *****
+MissingGLIServer.Message:Warning! You will not be able to work with collections within the Librarian Interface unless you specify the address of the remote Greenstone "gliserver" script. You can enter this now in the text field below, or later by going to Preferences and choosing the Connection tab. Remember that a valid URL must start with the protocol "http://" and end with "gliserver".
+MissingGLIServer.Title:Missing GLIServer Address
 #***** Missing GSDL *****
 MissingGSDL.Message:Warning! You will not be able to access all of the Librarian Interface's features without a local copy of Greenstone Digital Library also installed. If you believe you are receiving this message in error please check your installation, and the paths specified in Librarian Interface batch or script file.

trunk/gli/classes/xml/configRemote.xml

@@ -28 +28 @@
 ]>
 
-<Configuration version="2.61">
+<Configuration version="2.61a">
   <GathererConfig>
     <!-- ***** General Options: apply globally to the GLI execution. ***** -->
@@ -37 +37 @@
     <!-- The standard font used in the Gatherer. [Verdana, BOLD, 12] -->
     <Argument name="general.font">Verdana, BOLD, 12</Argument>
+    <Argument name="general.gliserver_url"/>
     <Argument name="general.library_url"/>
     <Argument name="general.locale">en_NZ</Argument>
@@ -98 +99 @@
     <Argument name="warning.MissingEXEC">true</Argument>
     <Argument name="warning.MissingGSDL">true</Argument>
+    <Argument name="warning.MissingGLIServer">true</Argument>
     <Argument name="warning.MissingImageMagick">true</Argument>
     <Argument name="warning.MissingPERL">true</Argument>

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

@@ -129 +129 @@
     static private String wget_version_str = StaticStrings.NO_WGET_STR;
 
+    static public URL gliserver_url = null;
     static public URL library_url = null;
 
@@ -182 +183 @@
         catch (MalformedURLException exception) {
         DebugStream.printStackTrace(exception);
+        }
+    }
+
+    // Read the Greenstone gliserver URL from the config file, if using a remote Greenstone
+    if (Gatherer.isGsdlRemote) {
+        String gliserver_url_string = getString("general.gliserver_url", true);
+        if (!gliserver_url_string.equals("")) {
+        try {
+            gliserver_url = new URL(gliserver_url_string);
+        }
+        catch (MalformedURLException exception) {
+            DebugStream.printStackTrace(exception);
+        }
         }
     }

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

@@ -93 +93 @@
     static public boolean isApplet = false;
     static public boolean isGsdlRemote = false;
-    static public String cgiBase = "";
+    static public String cgiBase = null;
 
     // feedback stuff
@@ -129 +129 @@
     }
 
-    // If a gliserver URL has been specified, we're using remote building
-    if (go.gliserver_url_string != null) {
+    // Are we using a remote Greenstone?
+    if (go.use_remote_greenstone) {
         isGsdlRemote = true;
-        cgiBase = go.gliserver_url_string.substring(0, go.gliserver_url_string.lastIndexOf('/') + 1);
-
-        // With remote building we use our own collect directory, since we can't use the Greenstone one
-        setCollectDirectoryPath(getGLIUserDirectoryPath() + "collect" + File.separator);
 
         // We don't have a local Greenstone!
         go.gsdl_path = null;
-    }
-
-    // We have a local Greenstone
-    if (!isGsdlRemote) {
+
+        // We have to use our own collect directory since we can't use the Greenstone one
+        setCollectDirectoryPath(getGLIUserDirectoryPath() + "collect" + File.separator);
+
+        // If a gliserver URL has been specified...
+        if (go.gliserver_url_string != null) {
+        cgiBase = go.gliserver_url_string.substring(0, go.gliserver_url_string.lastIndexOf('/') + 1);
+        }
+    }
+    // No, we have a local Greenstone
+    else {
         LocalGreenstone.setDirectoryPath(go.gsdl_path);
     }
@@ -151 +154 @@
     }
 
-    // Special code for running with a remote Greenstone
+    // More special code for running with a remote Greenstone
     if (isGsdlRemote) {
         Configuration.TEMPLATE_CONFIG_XML = "xml/configRemote.xml";
@@ -173 +176 @@
     }
 
-    init(go.gsdl_path, go.gsdl3_path, go.gsdl3_src_path, go.local_library_path, go.library_url_string, go.debug,
-         go.perl_path, go.no_load, go.filename, go.site_name, go.servlet_path, go.wget_path);
+    init(go.gsdl_path, go.gsdl3_path, go.gsdl3_src_path, go.local_library_path, go.library_url_string, 
+         go.gliserver_url_string, go.debug, go.perl_path, go.no_load, go.filename, go.site_name,
+         go.servlet_path, go.wget_path);
     }
 
 
     public void init(String gsdl_path, String gsdl3_path, String gsdl3_src_path, String local_library_path,
-             String library_url_string, boolean debug_enabled, String perl_path, 
-             boolean no_load, String open_collection, 
+             String library_url_string, String gliserver_url_string, boolean debug_enabled,
+             String perl_path, boolean no_load, String open_collection, 
              String site_name, String servlet_path, String wget_path) 
     {
@@ -273 +277 @@
         if (Configuration.library_url == null) {
         missingEXEC();
+        }
+
+        // The "-gliserver_url" option overwrites anything in the config files
+        if (gliserver_url_string != null && gliserver_url_string.length() > 0) {
+        try {
+            System.err.println("Setting gliserver_url to " + gliserver_url_string + "...");
+            Configuration.gliserver_url = new URL(gliserver_url_string);
+        }
+        catch (MalformedURLException error) {
+            DebugStream.printStackTrace(error);
+        }
+        }
+
+        // If we're using a remote Greenstone we need to know where the gliserver script is
+        System.err.println("Configuration.gliserver_url = " + Configuration.gliserver_url);
+        if (isGsdlRemote && Configuration.gliserver_url == null) {
+        missingGLIServer();
         }
 
@@ -683 +704 @@
         try {
         Configuration.library_url = new URL(library_url_string);
+        }
+        catch (MalformedURLException exception) {
+        DebugStream.printStackTrace(exception);
+        }
+    }
+    }
+
+
+    static private void missingGLIServer()
+    {
+    WarningDialog dialog = new WarningDialog("warning.MissingGLIServer", "MissingGLIServer.Title", Dictionary.get("MissingGLIServer.Message"), "general.gliserver_url", false);
+    dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false), Configuration.getColor("coloring.error_foreground", false), Configuration.getColor("coloring.error_background", false)));
+    dialog.display();
+    dialog.dispose();
+    dialog = null;
+
+    String gliserver_url_string = Configuration.getString("general.gliserver_url", true);
+    if (!gliserver_url_string.equals("")) {
+        try {
+        Configuration.gliserver_url = new URL(gliserver_url_string);
         }
         catch (MalformedURLException exception) {

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

@@ -120 +120 @@
         // }
 
-    String[] args = { "-gliserver_url", gliserver_url_string,
+    String[] args = { "-use_remote_greenstone",
+              "-gliserver_url", gliserver_url_string,
               "-library_url", library_url_string,
                     };

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

@@ -37 +37 @@
     public boolean feedback_enabled = false;
     public boolean no_load = false;
+    public boolean use_remote_greenstone = false;
 
     public String collect_directory_path = null;
@@ -135 +136 @@
             filename = null;
             }
+            // Use a remote Greenstone rather than a local one
+            else if (argument_name.equals(StaticStrings.USE_REMOTE_GREENSTONE_ARGUMENT)) {
+            use_remote_greenstone = true;
+            }
         }
         // 3b. Now for those that do

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

@@ -233 +233 @@
     static final public String UNKNOWNPLUG_STR                             = "UnknownPlug";
     static final public String USE_METADATA_FILES_ARGUMENT                = "use_metadata_files";
+    static final public String USE_REMOTE_GREENSTONE_ARGUMENT             = "-use_remote_greenstone";
     static final public String URL_SEPARATOR_CHARACTER                    = "/";
     static final public String VALUE_ATTRIBUTE                            = "value";