Changeset 8248

Timestamp:

2004-10-08T14:17:01+13:00 (20 years ago)

Author:

mdewsnip

Message:

Removed the getCollectionDir() function from Utility, since it is dependent on the Gatherer class.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• msm/GreenstoneArchiveParser.java (modified) (1 diff)
• msm/MetadataXMLFileManager.java (modified) (1 diff)
• util/Utility.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java

@@ -158 +158 @@
         file_path = MSMUtils.getValue(metadata_element);
         if (!file_path.startsWith(File.separator)) {
-        String collection_dir = Utility.getCollectionDir();
+        String collection_dir = Gatherer.c_man.getCollectionDirectory();
         file_path = collection_dir + file_path;
         }

trunk/gli/src/org/greenstone/gatherer/msm/MetadataXMLFileManager.java

@@ -360 +360 @@
         if ((Utility.isWindows() == true && filename.charAt(1) != ':') ||
             (Utility.isWindows() == false && !filename.startsWith(File.separator))) {
-            String collection_dir = Utility.getCollectionDir();
+            String collection_dir = Gatherer.c_man.getCollectionDirectory();
             File full_file = new File(collection_dir + filename);
             file = full_file;

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

@@ -493 +493 @@
     }
 
-    public static String getCollectionDir() {
-    String this_col_dir;
-
-    String col_name = Gatherer.c_man.getCollection().getName();
-
-    if (Gatherer.GS3) {
-        this_col_dir = getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, col_name);
-    } else {
-        this_col_dir = getCollectionDir(Configuration.gsdl_path, col_name);
-        
-    }
-
-    return this_col_dir;
-    }
-
     
     /** Method which constructs the configuration file given a certain collection.