Changeset 16272 for gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2008-07-02T11:51:05+12:00 (16 years ago)

Author:

ak19

Message:

New method canDoScheduling() replaces if tests in various locations. In future can adjust this method to reflect availability of scheduling under more circumstances.

File:

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

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

@@ -559 +559 @@
         // for remote case, scheduling causes an Exception on creating a new collection that 
         // can't be recovered from. For GS3, it doesn't work since it it trying to access etc/main.cfg
-        if (!Gatherer.isGsdlRemote && !Gatherer.GS3) {
+        if (canDoScheduling()) {
         scheduling();
         }
@@ -680 +680 @@
     //try to obtain email address of Greenstone installation webmaster for - used to indicate "sender". 
     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;
-    }
     BufferedReader maincfg = new BufferedReader(new FileReader(mcfg));      
         stmp = "";
@@ -1219 +1214 @@
         }
         
-        if (!Gatherer.isGsdlRemote && !Gatherer.GS3) {
+        if (canDoScheduling()) {
         //THIS LOOKS LIKE THE BEST PLACE TO TRY AND UPDATE .col FILES FOR EXISTING COLLECTIONS...Wendy
  
@@ -1290 +1285 @@
         }
         
-        if (!Gatherer.isGsdlRemote && !Gatherer.GS3) {
+        if (canDoScheduling()) {
         scheduling();
         }
@@ -1354 +1349 @@
     }
 
+    /** 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) {
+        return false;
+    } 
+    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;
+    }
+    
+    return true;
+    }
 
     private void makeCollection(String name, String email)