Changeset 11662 for trunk

Timestamp:

2006-04-20T12:05:58+12:00 (18 years ago)

Author:

mdewsnip

Message:

Fixed a nasty bug where the gliserver URL setting is automatically set, but set incorrectly (making the Greenstone v2.70 applet unusable). Also disabled editing of the library URL and gliserver URL settings in the Preferences.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• GathererApplet.java (modified) (1 diff)
• gui/Preferences.java (modified) (2 diffs)

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

@@ -113 +113 @@
     Gatherer.isApplet = true;
     String library_url_string = fullLibraryURL(getParameter("gwcgi"));
-    String gliserver_url_string = library_url_string.substring(0, library_url_string.lastIndexOf('/') + 1) + "gliserver";
+    String gliserver_url_string = library_url_string.substring(0, library_url_string.lastIndexOf('/') + 1) + "gliserver.pl";
 
         // String debug_param = getParameter("debug");

trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -198 +198 @@
         Dictionary.registerTooltip(library_path_field, "Preferences.Connection.Library_Path_Tooltip");
     }
+    // Disable this field when using the applet, as it is automatically determined
+    library_path_label.setEnabled(!Gatherer.isApplet);
+    library_path_field.setEnabled(!Gatherer.isApplet);
 
     JPanel gliserver_url_pane = null;
@@ -214 +217 @@
         Dictionary.registerText(gliserver_url_label, "Preferences.Connection.GLIServer_URL");
         Dictionary.registerTooltip(gliserver_url_field, "Preferences.Connection.GLIServer_URL_Tooltip");
+
+        // Disable this field when using the applet, as it is automatically determined
+        gliserver_url_label.setEnabled(!Gatherer.isApplet);
+        gliserver_url_field.setEnabled(!Gatherer.isApplet);
     }