Changeset 9876

Timestamp:

2005-05-16T11:28:47+12:00 (19 years ago)

Author:

davidb

Message:

Additional functionality added to GLIUserFolder. Under Windows, but default
the User's home is within "Documents and Settings/..." (usually on C: drive).
In a networked lab this means a user accessing GLI applet on a different
day on a different machine won't have the collections they built previously.
New functionality makes it possible to override where on the filesystem,
the GLIUserFolder is placed.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• GathererApplet.java (modified) (3 diffs)
• util/Utility.java (modified) (2 diffs)

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

@@ -100 +100 @@
     }
 
-    // Ensure the GLI user directory exists
-    File gli_user_directory = Utility.getGLIUserFolder();
-    if (!gli_user_directory.exists()) {
-        gli_user_directory.mkdirs();
-    }
-
     String gwcgi = getParameter("gwcgi");
     String library_cgi = fullLibraryURL(gwcgi);
@@ -111 +105 @@
     String cgi_base = library_cgi.substring(0,cgi_base_cut+1);
 
+        String windows_home = getParameter("windowsHome");
+        File gli_user_directory = Utility.setGLIUserFolder(windows_home);
+    if (!gli_user_directory.exists()) {
+        gli_user_directory.mkdirs();
+    }
+
     gatherer = new Gatherer();
 
@@ -118 +118 @@
 
     GetOpt go = new GetOpt(args);
+
+        String debug_param = getParameter("debug");
+
+        if ((debug_param != null) && (debug_param.matches("true"))) {
+            go.debug = true;
+        }
 
     if (go.feedback_enabled) {

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -122 +122 @@
     static final public String XML_DIRECTORY = "xml" + File.separator;
 
+    static protected File gli_user_folder = null;
+
     // These are out of alphabetic order to avoid forward reference error.
     /** The default icon to produce a 'help-icon' sized blank space before a menu entry. */
@@ -407 +409 @@
     static final private String WIN_GLI_CONFIG_FOLDER = "Greenstone" + File.separator + "GLI";
 
+    static public File setGLIUserFolder(String windows_home) {
+        gli_user_folder = null;
+        if(Utility.isWindows()) {
+            if ((windows_home != null) && (windows_home != "")) {
+                gli_user_folder = new File(windows_home + File.separator + "GLI" + File.separator);
+            }
+            else {
+                gli_user_folder = new File(System.getProperty(USER_HOME_PROPERTY) + File.separator + APPLICATION_DATA_FOLDER + File.separator + WIN_GLI_CONFIG_FOLDER + File.separator);
+            }
+        }
+        else {
+            gli_user_folder = new File(System.getProperty(USER_HOME_PROPERTY) +
+File.separator + UNIX_GLI_CONFIG_FOLDER + File.separator);
+        }
+        return gli_user_folder;
+    }
+
     static public File getGLIUserFolder()
     {
-    if (Utility.isWindows()) {
-        return new File(System.getProperty(USER_HOME_PROPERTY) + File.separator + APPLICATION_DATA_FOLDER + File.separator + WIN_GLI_CONFIG_FOLDER + File.separator);
-    }
-    else {
-        return new File(System.getProperty(USER_HOME_PROPERTY) + File.separator + UNIX_GLI_CONFIG_FOLDER + File.separator);
-    }
+    return gli_user_folder;
     }