Changeset 16884 for gli/trunk

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.

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (3 diffs)
• Gatherer.java (modified) (5 diffs)
• gui/GUIManager.java (modified) (1 diff)
• gui/Preferences.java (modified) (1 diff)

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

@@ -180 +180 @@
 
     // Read the Greenstone library URL from the config file
-    String library_url_string = getString("general.library_url", true);
+    String library_url_string = getString("general.library_url"+gliPropertyNameSuffix(), true);
     if (!library_url_string.equals("")) {
         try {
@@ -208 +208 @@
 
     }
+
+    /** @return the suffix for the the config file's library_url/open_collection propertyname. 
+     * For Fedora and remote GS2 cases, there is no suffix.
+     * However, when dealing with a local Greenstone server, this returns suffix _gs2 or _gs3
+     * so it can be appended to the default library_url/open_collection propertynames.
+     * Having 2 separate library URL properties and open_collection properties for the two 
+     * local versions of Greenstone allows GLI to save the library_url and last opened 
+     * collection for both GS2 and GS3 in case anyone runs them alternatively. (This is useful
+     * when developing and testing across GS versions.) */
+    static public String gliPropertyNameSuffix() {
+    if(Gatherer.isGsdlRemote || fedora_info.isActive()) {
+        return ""; // no special suffix
+    } else if(Gatherer.GS3) { // local GS3
+        return "_gs3";
+    } else { // local GS2
+        return "_gs2";
+    }
+    }
+
 
     // Called when (gsdl3_path != null) || (Gatherer.GS3 && Gatherer.isGsdlRemote) 
@@ -268 +287 @@
         // Argument found
         if (old_argument_element_name.equals(new_argument_element_name)) {
-            if (!new_argument_element_name.equals("general.open_collection")) {
+            if (!new_argument_element_name.equals("general.open_collection"+Configuration.gliPropertyNameSuffix())) {
             String old_argument_element_value = XMLTools.getElementTextValue(old_argument_element);
             if (!old_argument_element_value.equals(new_argument_element_value)) {

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){

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

@@ -464 +464 @@
     // If we have a collection open remember it for next time, then save it and close it
     if (Gatherer.c_man.ready()) {
-        Configuration.setString("general.open_collection", true, CollectionManager.getLoadedCollectionColFilePath());
+        Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                    true, CollectionManager.getLoadedCollectionColFilePath());
         saveThenCloseCurrentCollection();
     }
     else {
-        Configuration.setString("general.open_collection", true, null);
+        Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, null);
     }
 

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

@@ -669 +669 @@
         }
         }
-        Configuration.setString("general.library_url", true, library_url_string);
+
+        Configuration.setString("general.library_url"+Configuration.gliPropertyNameSuffix(), 
+                    true, library_url_string);
 
         if (Gatherer.isGsdlRemote && !Gatherer.GS3) {