Changeset 16304 for gli/trunk

Timestamp:

2008-07-04T13:34:56+12:00 (16 years ago)

Author:

ak19

Message:

Undid previous commit: extra clause on scheduling which will be modified later.

File:

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

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

@@ -1349 +1349 @@
     }
 
-    /** At present, scheduling only works for GS2 and only when GS2 is local. This
-     * method can be adjusted as scheduling becomes available for more situations. */
+    /** At present, scheduling only works for GS2, only when GS2 is local and only when GLI runs from
+     * within a GS2 installation. This method can be adjusted as scheduling becomes available for more
+     * more situations. */
     private boolean canDoScheduling() {
     if(Gatherer.isGsdlRemote) {
@@ -1356 +1357 @@
     } 
     if(Gatherer.GS3) {
+        return false;
+    }
+
+    // GS2's etc/main.cfg is necessary for scheduling, but scheduling looks for it locally: 
+    // it assumes GLI is inside a GS2 installation
+    File mcfg = new File(LocalGreenstone.getDirectoryPath() + File.separator + "etc" + File.separator + "main.cfg");
+    if(!mcfg.exists()) {
+        System.out.println("Cannot do scheduling, since there is no file: " + mcfg.getAbsolutePath() 
+                   + ".\nScheduling presently depends on GLI running from inside a GS2.");
         return false;
     }