Changeset 22806 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2010-08-30T16:29:40+12:00 (14 years ago)

Author:

ak19

Message:

Further changes to ticket 152 (movable collectdir). Need to deal with GLI being started and reading in a non-standard collectdir from config files (stored from a previous GLI session) that now no longer exists. In this case need to revert back to the default Greenstone collectdir. Tested on Windows with the included Apache webserver and server.exe

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (5 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -505 +505 @@
         // If opening a collection outside the standard GS collect folder, need
         // to open the non-standard collect folder that the collection resides in
-        if (open_collection_file_path != null && 
-        !open_collection_file_path.startsWith(getCollectDirectoryPath())) {
+        if (open_collection_file_path != null &&
+        !open_collection_file_path.startsWith(getDefaultGSCollectDirectoryPath(true))) {
         File collectFolder = null;
         if(!open_collection_file_path.endsWith("gli.col")) { // then it's a collect folder
@@ -520 +520 @@
         String cfg_file = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
         if(new File(collectFolder.getAbsolutePath()+File.separator+cfg_file).exists()) { // colgroup
-            collectFolder = collectFolder.getParentFile();
-            
-        }
-        setCollectDirectoryPath(collectFolder.getAbsolutePath()); // now set this as the current collect folder
-        }
-        
-    }
-    catch (Exception exception) {
+            collectFolder = collectFolder.getParentFile();          
+        }
+        
+        if(!isGsdlRemote && !collectFolder.exists()) {
+            // if dealing with a local server but the collectdir no longer exists, 
+            // use the default greenstone collect directory, and write that to affected files
+            open_collection_file_path = null; // no longer have an open collection from last time if coldir doesn't exist
+            
+            String defaultColDir = getDefaultGSCollectDirectoryPath(false); // no file separator at end         
+            
+            setCollectDirectoryPath(defaultColDir); // will ensure the required file separator at end
+            
+            Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(),
+                    true, defaultColDir + File.separator);
+            
+            if(Gatherer.GS3) {  // GS2's gsdlsite.cfg was taken care of when LocalLibraryServer was started up
+                                // (LocalLibraryServer would also already have set glisite.cfg to the correct collecthome)
+                String gsdlsitecfg = Configuration.gsdl3_path + File.separator 
+                    + "WEB-INF" + File.separator + "cgi" + File.separator + "gsdl3site.cfg";
+                Utility.updatePropertyConfigFile(gsdlsitecfg, "collecthome", defaultColDir); // no file separator               
+            }
+        } else { // remote GS or collect dir exists
+            setCollectDirectoryPath(collectFolder.getAbsolutePath()); // now set this as the current collect folder         
+        }
+    }
+    } catch (Exception exception) {
         DebugStream.printStackTrace(exception);
     }
@@ -715 +733 @@
     }
     
-    return getDefaultGSCollectDirectoryPath();
+    return getDefaultGSCollectDirectoryPath(true); // file separator appended
     
     }
 
     /** Returns the path of the Greenstone "collect" directory. */
-    static public String getDefaultGSCollectDirectoryPath() {
-        if (!GS3) {
-            return Configuration.gsdl_path + "collect" + File.separator;
+    static public String getDefaultGSCollectDirectoryPath(boolean appendSeparator) {
+        String colDir;
+        if (GS3) {
+            colDir = getSitesDirectoryPath() + Configuration.site_name + File.separator + "collect";            
         }
         else {
-            return getSitesDirectoryPath() + Configuration.site_name + File.separator + "collect" + File.separator;
-        }
+            colDir = Configuration.gsdl_path + "collect";
+        }
+        
+        if(appendSeparator) {
+            colDir += File.separator;
+        }
+        return colDir;
     }   
 
@@ -802 +826 @@
     }
 
-    // first save any open collection in the *old* location
+    // first save any open collection in the old location, then close it
     if(Gatherer.c_man.getCollection() != null) {
-        Gatherer.setCollectDirectoryPath(oldCollectPath); // go back to current collection's location
         Gatherer.g_man.saveThenCloseCurrentCollection(); // close the current collection first
     }
@@ -830 +853 @@
     if(Gatherer.GS3) { // web/WEB-INF/cgi/gsdl3site.cfg
         gsdlsitecfg = Configuration.gsdl3_path + File.separator + "WEB-INF" 
-        + File.separator + "cgi" + File.separator + "gsdl3site.cfg";
+            + File.separator + "cgi" + File.separator + "gsdl3site.cfg";
     } else { // cgi-bin/gsdlsite.cfg
         gsdlsitecfg = Configuration.gsdl_path + File.separator 
-        + "cgi-bin" + File.separator + "gsdlsite.cfg";
+            + "cgi-bin" + File.separator + "gsdlsite.cfg";
     }