Changeset 15362

Timestamp:

2008-05-07T18:49:05+12:00 (16 years ago)

Author:

ak19

Message:

Modified built() to check whether FLI collection has been built for greenstone 3 (not just for greenstone 2)

File:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (1 diff)

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

@@ -215 +215 @@
     public boolean built() {
     if(collection != null) {
-        // Determine if the collection has been built by looking for the build.cfg (gs20 buildConfig.xml (gs3) or export.inf (fedora) file
+        // Determine if the collection has been built by looking for the build.cfg (gs2) 
+        // buildConfig.xml (gs3) or export.inf (fedora) file
         String file_name = "";
-
-        if (Gatherer.GS3) {
-        file_name = getLoadedCollectionIndexDirectoryPath() + Utility.BUILD_CONFIG_XML;
-        }
-        else {
-        if (Configuration.fedora_info.isActive()) {
-            // Fedora build
-            //file_name = getLoadedCollectionArchivesDirectoryPath() + "import.inf";
-            file_name = getLoadedCollectionExportDirectoryPath() + "export.inf";
-        }
-        else {
-            file_name = getLoadedCollectionIndexDirectoryPath() + Utility.BUILD_CFG;
-        }
-        }
-
+        
+        if (Configuration.fedora_info.isActive()) { // FLI case
+        // Fedora build
+        //file_name = getLoadedCollectionArchivesDirectoryPath() + "import.inf";
+        file_name = getLoadedCollectionExportDirectoryPath() + "export.inf";
+        } else { 
+        // GLI is running, check if it's greenstone 3 or greenstone 2
+        if (Gatherer.GS3) { // GS3 GLI
+            file_name = getLoadedCollectionIndexDirectoryPath() + Utility.BUILD_CONFIG_XML;
+        }
+        else { // greenstone 2 GLI
+            file_name = getLoadedCollectionIndexDirectoryPath() + Utility.BUILD_CFG;           
+        }
+        }
         File test_file = new File(file_name);
         return test_file.exists();