Changeset 6530 for trunk/gli

Timestamp:

2004-01-16T15:48:42+13:00 (20 years ago)

Author:

jmt12

Message:

Extended configuration to store details about the current previewing software, and streamlined determining the language

File:

• trunk/gli/src/org/greenstone/gatherer/Configuration.java (modified) (6 diffs)

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

@@ -98 +98 @@
     /** The username for the proxy server indicated above. */
     public String proxy_user = null;
-    /** The language selected for the interface. Currently hard-wired. */
-    public String interface_language = "en";
     /** The screen size of the desktop the Gatherer will be displayed on. */
     public Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
@@ -177 +175 @@
     }
 
-    // Try to reload the configuration.
-    File config_xml = new File(CONFIG_XML);
-    if(config_xml.exists()) {
-        general_config = Utility.parse(CONFIG_XML, false);
-    }
-    // If that fails retrieve the default configuration file from our xml library, which I'll personally guarantee to work.
+    // Try to reload the configuration. The first place we look is the user specific location
+    File user_config_xml = null;
+    // Windows. What to do, what to do?
+    if(Utility.isWindows()) {
+        
+    }
+    // Unix based systems. This one I know. Look for .gli/config.xml in the users home folder
+    else {
+        user_config_xml = new File(System.getProperty("user.home") + File.separator + ".gli" + File.separator + CONFIG_XML);        
+    }
+    if(user_config_xml != null && user_config_xml.exists()) {
+        general_config = Utility.parse(user_config_xml.getAbsolutePath(), false);
+    }
+
+    // We then try within the gli directory itself
+    if(general_config == null) {
+        File config_xml = new File(CONFIG_XML);
+        if(config_xml.exists()) {
+        general_config = Utility.parse(CONFIG_XML, false);
+        }
+    }
+
+    // And if that fails retrieve the default configuration file from our xml library, which I'll personally guarantee to work.
     if(general_config == null) {
         general_config = Utility.parse(TEMPLATE_CONFIG_XML, true);
@@ -437 +452 @@
     }
     return result;
+    }
+
+    /** Retrieves the current interface language two letter code. */
+    public String getLanguage() {
+    Locale locale = getLocale("general.locale", GENERAL_SETTING);
+    String code = "en"; // Default
+    if(locale != null) {
+        code = locale.getLanguage();
+    }
+    return code;
     }
 
@@ -489 +514 @@
     }
 
+    public String getPreviewCommand() {
+    return getString("general.preview_program", GENERAL_SETTING);
+    }
+
     /** Retrieve the value of the named property, and noting whether we consult the general or collection specific configuration. */
     public String getString(String property, boolean general) {
@@ -576 +605 @@
     public void save() {
     ///ystem.err.println("Hits " + cache_hit + " vs Misses " + cache_miss);
-    Utility.export(general_config, Utility.BASE_DIR + CONFIG_XML);
+    // We first try exporting to a user specific place
+    File user_config_xml = null;
+    try {
+        if(Utility.isWindows()) {
+        
+        }
+        // Unix systems save user preferences in . folders in the home directory.
+        else {
+        user_config_xml = new File(System.getProperty("user.home") + File.separator + ".gli" + File.separator + CONFIG_XML);
+        ///ystem.err.println("Trying to save to: " + user_config_xml.getAbsolutePath());
+        ///ystem.err.println("Writing.");
+        user_config_xml.getParentFile().mkdirs();
+        Utility.export(general_config, user_config_xml.getAbsolutePath());
+        }
+    }
+    catch(Exception exception) {
+        user_config_xml = null;
+    }
+    // Always do this if the above fails.
+    if(user_config_xml == null || !user_config_xml.exists()) {
+        // But failing that we produce a general copy
+        Utility.export(general_config, Utility.BASE_DIR + CONFIG_XML);
+    }
     }
 
@@ -711 +762 @@
     public void setMode(int value) {
     setInt("general.mode", GENERAL_SETTING, value);
+    }
+
+    public void setPreviewCommand(String value) {
+    setString("general.preview_program", GENERAL_SETTING, value);
     }