Changeset 9045 for trunk/gli/src/org/greenstone/gatherer/util

Timestamp:

2005-02-15T15:39:48+13:00 (19 years ago)

Author:

mdewsnip

Message:

Made major rearrangements to the way path variables are calculated. This is to facilitate being able to specify a "-collectdir" argument to the GLI so one GLI installation can be used in a networked, multi-user situation. Hope I haven't broken anything!

File:

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

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

@@ -345 +345 @@
     return new File(getGLIUserFolder(), StaticStrings.CACHE_FOLDER);
     }
-    /** Method which constructs the collect directory for Greenstone.
-     * @param gsdl_path The location of the gsdl installation directory as a <strong>String</strong>.
-     * @return The location of the collection directory, also as a <strong>String</strong>.
-     */
-    public static String getCollectDir(String gsdl_path) {
-    return gsdl_path + COL_DIR;
-    }
-    static public String getCollectDir(String gsdl3_path, String site_name) {
-    return getSitesDir(gsdl3_path) + site_name + File.separator + COL_DIR;
-    }
-
-    
-    /** Method which constructs a collection's top level directory
-     * @@param gsdl_path The location of the gsdl installation directory as a <strong>String</strong>.
-     * @param The name of the collection as a <strong>String</strong>.
-     * @return The location of the collection's base directory
-     */
-    public static String getCollectionDir(String gsdl_path, String coll_name) {
-    return getCollectDir(gsdl_path) + coll_name + File.separator;
-    }
-    public static String getCollectionDir(String gsdl3_path, String site_name, String coll_name) {
-    return getCollectDir(gsdl3_path, site_name) + coll_name + File.separator;
-    }
 
     
@@ -485 +462 @@
     }
 
-    /** Method which constructs the images directory given a certain collection.
-     * @param col_dir The location of the collection directory as a <strong>String</strong>.
-     * @return The location of the given collections images directory, also as a <strong>String</strong>.
-     */
-    public static String getImagesDir(String col_dir) {
-    return col_dir + IMAGES_DIR;
-    }
+
     /** Method which constructs the import directory given a certain collection.
      * @param col_dir The location of the collection directory as a <strong>String</strong>.
@@ -709 +680 @@
 
 
-    static public void zipup(String col_name, String dir_or_file)
-    {
-    String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
+    static public void zipup(String col_dir, String col_name, String dir_or_file)
+    {
     int prefix_strip = col_dir.length();
 
@@ -762 +732 @@
     
 
-    static public void unzip(String col_name)
-    {
-    String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
+    static public void unzip(String col_dir, String col_name)
+    {
     String zip_fname = col_dir + col_name + ".zip";
     int zip_mode = ZipFile.OPEN_READ | ZipFile.OPEN_DELETE;