Changeset 7980

Timestamp:

2004-08-18T13:45:58+12:00 (20 years ago)

Author:

mdewsnip

Message:

Changed ARCHIVE_DIR to ARCHIVES_DIR.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (1 diff)
• util/Utility.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -417 +417 @@
         // Do a dry metadata import run over the entire base collection, recording profile mappings. We do this by finding the archive files, and then iterating over them using the GreenstoneArchiveParser to retrieve metadata from them. We then process the importing of new metadata elements using the selectElement prompt used in a file action metadata import. However the big change is that we don't actually import any metadata, just create importing profiles.
         if(!skip_import_phase) {
-            File base_archive = new File(base_collection_directory, Utility.ARCHIVE_DIR);
+            File base_archive = new File(base_collection_directory, Utility.ARCHIVES_DIR);
             if(base_archive.exists()) {
             Gatherer.println("+ Archive directory found. Inspecting archives for metadata information.");

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

@@ -66 +66 @@
     /** The size of the io buffer, calculated as FACTOR * 1024. */
     static final public int BUFFER_SIZE = FACTOR * 1024;
-    /** Definition of an important directory name, in this case the archive directory for the collection. */
-    static final public String ARCHIVE_DIR = "archives" + File.separator;
+    /** Definition of an important directory name, in this case the archives directory of the collection. */
+    static final public String ARCHIVES_DIR = "archives" + File.separator;
     /** Definition of an important directory name, in this case the base dir, or the working directory of the Gatherer. */
     static public String BASE_DIR  = System.getProperty("user.dir") + File.separator;
@@ -449 +449 @@
      */
     static public String getArchiveDir(String col_dir) {
-    return col_dir + ARCHIVE_DIR;
+    return col_dir + ARCHIVES_DIR;
     }