Changeset 6581

Timestamp:

2004-01-22T13:52:25+13:00 (20 years ago)

Author:

jmt12

Message:

Utility has had several changes including Help stuff and Mirroring stuff.

File:

• trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (2 diffs)

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

@@ -480 +480 @@
     return col_dir + BUILD_DIR;
     }
-    /** Builds the private cache dir by appending col_dir and 'cache'.
-     * @param col_dir A String representing the directory path of the current collection.
-     * @return A String representing the path to the private file cache within the current collection.
-     */
-    public static String getCacheDir(String col_dir) {
-    return col_dir + GCACHE_DIR;
+    /** Builds the cache dir by appending the user path and 'cache'.
+     * @return a File representing the path to the private file cache within the current collection.
+     */
+    public static File getCacheDir() {
+    return new File(getGLIUserFolder(), StaticStrings.CACHE_FOLDER);
     }
     /** Method which constructs the collection directory for Greenstone.
@@ -555 +554 @@
     }
 
+    static public File getGLIUserFolder() {
+    File gli_user_folder = new File(System.getProperty("user.home") + File.separator + ".gli" + File.separator);
+    return gli_user_folder;
+    }
+
     /** Retrieve the full file path to the help index xml file.
      * @return the full path as a String
      */
-    static public String getHelpIndex() {
-    String help_index = HELP_DIR + Gatherer.config.getLanguage() + File.separator + StaticStrings.HELP_INDEX_FILENAME;
-    File help_index_file = new File(help_index);
+    static public String getHelpFolder() {
+    String help_folder = HELP_DIR + Gatherer.config.getLanguage() + File.separator;
+    File help_folder_file = new File(help_folder);
     // If that file can't be found, default to english
-    if(!help_index_file.exists()) {
-        help_index = HELP_DIR + StaticStrings.ENGLISH_LANGUAGE_STR  + File.separator + StaticStrings.HELP_INDEX_FILENAME;
-    }
-    return help_index;
+    if(!help_folder_file.exists()) {
+        help_folder = HELP_DIR + StaticStrings.ENGLISH_LANGUAGE_STR  + File.separator;
+    }
+    return help_folder;
     }