Changeset 16265

Timestamp:

2008-07-01T18:51:07+12:00 (15 years ago)

Author:

ak19

Message:

Scheduling method requires that Greenstone be version 2 AND that the GLI that is running it is located inside the Greenstone 2 installation (since it requires the main.cfg inside GS2's etc folder). In other cases GLI crashes when trying to create a new collection. This will need to be fixed later so that it is no longer dependent on 1. where GLI is located; 2. Whether GS is v2 or v3; 3. Whether GS is a remote server or local.

File:

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

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

@@ -558 +558 @@
 
         // for remote case, scheduling causes an Exception on creating a new collection that 
-        // can't be recovered from. 
-        if (!Gatherer.isGsdlRemote) {
+        // 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) {
         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 = "";
@@ -1214 +1219 @@
         }
         
-        if (!Gatherer.isGsdlRemote) {
+        if (!Gatherer.isGsdlRemote && !Gatherer.GS3) {
         //THIS LOOKS LIKE THE BEST PLACE TO TRY AND UPDATE .col FILES FOR EXISTING COLLECTIONS...Wendy
  
@@ -1285 +1290 @@
         }
         
-        if (!Gatherer.isGsdlRemote) {
+        if (!Gatherer.isGsdlRemote && !Gatherer.GS3) {
         scheduling();
         }