Changeset 6863

Timestamp:

2004-02-24T10:57:57+13:00 (20 years ago)

Author:

kjdon

Message:

added a few alternative methods to find coll directories, using coll_home instead of site_home + coll_name

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSFile.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSFile.java

@@ -67 +67 @@
     static public String collectionConfigFile(String site_home, 
                           String collection_name) {
-    return site_home+File.separatorChar+"collect"+
-            File.separatorChar+collection_name+
-            File.separatorChar+"etc"+
+    return collectionConfigFile(collectionBaseDir(site_home, collection_name));
+    }
+    static public String collectionConfigFile(String collection_home) {
+    return collectionEtcDir(collection_home) +
             File.separatorChar+"collectionConfig.xml";
 
@@ -111 +112 @@
         File.separatorChar+collection_name;
     }
+    /** collection archive directory path */
+    static public String collectionArchiveDir(String site_home,
+                       String collection_name) {
+    return collectionArchiveDir(collectionBaseDir(site_home, collection_name)); 
+    }
+    static public String collectionArchiveDir(String collection_home) {
+    return collection_home+File.separatorChar+"archives";
+    }
+    
     /** collection building directory path */    
     static public String collectionBuildDir(String site_home,
                        String collection_name) {
-    return collectionBaseDir(site_home, collection_name) +
-        File.separatorChar+"building";
-    }
+    return collectionBuildDir(collectionBaseDir(site_home, collection_name));
+    }
+    static public String collectionBuildDir(String collection_home) {
+    return collection_home+File.separator+"building";
+    }
+    /** collection building directory path */    
+    static public String collectionEtcDir(String site_home,
+                       String collection_name) {
+    return collectionEtcDir(collectionBaseDir(site_home, collection_name));
+    }
+    static public String collectionEtcDir(String collection_home) {
+    return collection_home+File.separator+"etc";
+    }
+
     /** collection building directory path */    
     static public String collectionImportDir(String site_home,
                        String collection_name) {
-    return collectionBaseDir(site_home, collection_name) +
-        File.separatorChar+"import";
+    return collectionImportDir(collectionBaseDir(site_home, collection_name));
+        
+    }
+    static public String collectionImportDir(String collection_home) {
+    return collection_home + File.separatorChar+"import";
     }
     /** collection building directory path */    
     static public String collectionIndexDir(String site_home,
                        String collection_name) {
-    return collectionBaseDir(site_home, collection_name) +
-        File.separatorChar+"index";
-    }
-
+    return collectionIndexDir(collectionBaseDir(site_home, collection_name));
+        
+    }
+    static public String collectionIndexDir(String collection_home) {
+    return collection_home + File.separatorChar+"index";
+    }
+    
     /** text path (for doc retrieval) relative to collectionBaseDir */
     static public String collectionTextPath(String collection_name) {