Changeset 10560

Timestamp:

2005-08-25T12:05:49+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added a getCollectionDirectoryPath() function that returns the path of the currently open collection directory.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (11 diffs)

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

@@ -213 +213 @@
 
     // Remove the lock on this file, then remove the collection.
-    String collection_directory_path = getCollectionDirectoryPath(collection.getName());
-    File lock_file = new File(collection_directory_path + LOCK_FILE);
+    File lock_file = new File(getCollectionDirectoryPath() + LOCK_FILE);
     lock_file.delete();
     if (lock_file.exists()) {
@@ -521 +520 @@
 
 
+    static public String getCollectionDirectoryPath()
+    {
+    return Gatherer.getCollectDirectoryPath() + collection.getName() + File.separator;
+    }
+
+
     /** Constructs the absolute filename of the collection's directory, which should resemble "$GSDLHOME/collect/<col_name>"
      * @return A <strong>String</strong> containing the directory name.
@@ -535 +540 @@
     public String getCollectionFilePath()
     {
-    return getCollectionDirectoryPath(collection.getName()) + collection.getName() + ".col";
+    return getCollectionDirectoryPath() + collection.getName() + ".col";
     }
 
@@ -544 +549 @@
     public String getCollectionArchivesDirectoryPath()
     {
-    return getCollectionDirectoryPath(collection.getName()) + "archives" + File.separator;
+    return getCollectionDirectoryPath() + "archives" + File.separator;
     }
 
@@ -553 +558 @@
     public String getCollectionBuildingDirectoryPath()
     {
-    return getCollectionDirectoryPath(collection.getName()) + "building" + File.separator;
+    return getCollectionDirectoryPath() + "building" + File.separator;
     }
 
@@ -571 +576 @@
     public String getCollectionEtcDirectoryPath()
     {
-    return getCollectionDirectoryPath(collection.getName()) + "etc" + File.separator;
+    return getCollectionDirectoryPath() + "etc" + File.separator;
     }
 
@@ -580 +585 @@
     public String getCollectionImagesDirectoryPath()
     {
-    return getCollectionDirectoryPath(collection.getName()) + "images" + File.separator;
+    return getCollectionDirectoryPath() + "images" + File.separator;
     }
 
@@ -589 +594 @@
     public String getCollectionImportDirectoryPath()
     {
-    return getCollectionDirectoryPath(collection.getName()) + "import" + File.separator;
+    return getCollectionDirectoryPath() + "import" + File.separator;
     }
 
@@ -598 +603 @@
     public String getCollectionIndexDirectoryPath()
     {
-    return getCollectionDirectoryPath(collection.getName()) + "index" + File.separator;
+    return getCollectionDirectoryPath() + "index" + File.separator;
     }
 
@@ -607 +612 @@
     public String getCollectionLogDirectoryPath()
     {
-    return getCollectionDirectoryPath(collection.getName()) + "log" + File.separator;
+    return getCollectionDirectoryPath() + "log" + File.separator;
     }
 
@@ -616 +621 @@
     public String getCollectionMetadataDirectoryPath()
     {
-    return getCollectionDirectoryPath(collection.getName()) + "metadata" + File.separator;
+    return getCollectionDirectoryPath() + "metadata" + File.separator;
     }