Changeset 16884 for gli/trunk/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2008-08-18T16:35:36+12:00 (16 years ago)

Author:

ak19

Message:

When GS is local, it will use library_url_gs3 or library_url_gs2 and similarly open_collection_gs3 or open_collection_gs2 properties from the config file. (It still uses the default library_url and open_collection when GS is remote or if GLI is used with Fedora.) Method Configuration.gliPropertyNameSuffix() is added to return either the empty string or _gs2 or _gs3 in order to work out the property name in the situation. This change helps when running local GS2 and GS3 alternatively with GLI, as it preserves the library url and last opened collection for each separately.

File:

• gli/trunk/src/org/greenstone/gatherer/Gatherer.java (modified) (5 diffs)

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

@@ -82 +82 @@
         */
 
-    static final public String PROGRAM_VERSION = "svn-trunk";
+    static final public String PROGRAM_VERSION = "trunk";
 
     static private Dimension size = new Dimension(800, 540);
@@ -444 +444 @@
         open_collection_file_path = open_collection;
         if (open_collection_file_path == null) {
-        open_collection_file_path = Configuration.getString("general.open_collection", true);
+        open_collection_file_path = Configuration.getString(
+            "general.open_collection"+Configuration.gliPropertyNameSuffix(), true);
         }
         if (no_load || open_collection_file_path.equals("")) {
@@ -801 +802 @@
     static private void missingEXEC() {
     WarningDialog dialog;
+    String configPropertyName = "general.library_url"+Configuration.gliPropertyNameSuffix();
+
     if (GS3) {
-        dialog = new WarningDialog("warning.MissingEXEC", Dictionary.get("MissingEXEC_GS3.Title"), Dictionary.get("MissingEXEC_GS3.Message"), "general.library_url", false);
-    }else {
-        dialog = new WarningDialog("warning.MissingEXEC", Dictionary.get("MissingEXEC.Title"), Dictionary.get("MissingEXEC.Message"), "general.library_url", false);
-    }
+        dialog = new WarningDialog("warning.MissingEXEC", Dictionary.get("MissingEXEC_GS3.Title"), Dictionary.get("MissingEXEC_GS3.Message"), configPropertyName, false);
+    } else { // local case
+        dialog = new WarningDialog("warning.MissingEXEC", Dictionary.get("MissingEXEC.Title"), Dictionary.get("MissingEXEC.Message"), configPropertyName, false);
+    }
+
     dialog.setValueField(new URLField.Text(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false)));
     dialog.display();
@@ -811 +815 @@
     dialog = null;
 
-    String library_url_string = Configuration.getString("general.library_url", true);
+    String library_url_string = Configuration.getString(configPropertyName, true);
     if (!library_url_string.equals("")) {
         try {
@@ -912 +916 @@
     dialog.setValueField(new URLField.DropDown(Configuration.getColor("coloring.editable_foreground", false), 
                            Configuration.getColor("coloring.editable_background", false), 
-                           defaultURLs, "general.gliserver_url", "general.open_collection",  
-                           "gliserver.pl"));
+                           defaultURLs, "general.gliserver_url", 
+                           "general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                           "gliserver.pl")); 
 
     if (Gatherer.default_gliserver_url!=null){