Changeset 27825

Timestamp:

2013-07-12T17:09:11+12:00 (11 years ago)

Author:

davidb

Message:

'writabe' version of gsdl3_home introduced to help support Greenstone running off a read-only medium, such as a DVD

File:

• main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java (modified) (6 diffs)

main/trunk/greenstone3/src/java/org/greenstone/util/GlobalProperties.java

@@ -35 +35 @@
     private static String properties_filename = "global.properties";
     private static String gsdl3_home = null;
+    private static String gsdl3_writablehome = null;
     private static String gsdl3_web_address = null;
     private static String full_gsdl3_web_address = null;
@@ -56 +57 @@
     {
         return gsdl3_home;
+    }
+
+    public static String getGSDL3WritableHome()
+    {
+        return gsdl3_writablehome;
     }
 
@@ -80 +86 @@
             if (in != null)
             {
-                logger.debug("loading global properties");
+                logger.debug("Loading global properties");
                 properties.load(in);
                 in.close();
@@ -86 +92 @@
             else
             {
-                logger.error("couldn't load global properties!");
+                logger.error("Couldn't load global properties: " + properties_filename);
             }
 
             gsdl3_home = properties.getProperty("gsdl3.home");
-            if ((gsdl3_home == null || gsdl3_home.length() == 0) && optionalGS3Home != null && optionalGS3Home.length() > 0)
+            if ((gsdl3_home == null || gsdl3_home.length() == 0) 
+                && optionalGS3Home != null && optionalGS3Home.length() > 0)
             {
                 gsdl3_home = optionalGS3Home;
@@ -102 +109 @@
 
             // make sure the path separators are correct
-            // gsdl3_home may be null, eg when we are loading properties from Server3
+            // gsdl3_home may be null, e.g., when we are loading properties from Server3
             if (gsdl3_home != null)
             {
@@ -108 +115 @@
                 gsdl3_home = gs3_file.getPath();
             }
+
+            gsdl3_writablehome = properties.getProperty("gsdl3.writablehome");
+            // if gsdl3_writablehome is null, then defaults to gsdl3_home
+            if (gsdl3_writablehome == null) { 
+                gsdl3_writablehome = gsdl3_home;
+            }
+
             //build the gsdl3 web address, in a way resilient to errors and ommisions in global.properties, simplifying where possible
             //aiming for a string with no trailing slash, eg "http://localhost:8080/greenstone3" or "http://www.mygreenstonelibrary.com"