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

Timestamp:

2010-10-15T20:33:43+13:00 (14 years ago)

Author:

ak19

Message:

More changes to making collectdir movable: 1. When not working with a remote GS or server.exe: if the collecthome set in GLI is not the same as the one in gsdlsite.cfg used by the apache web server, then a dialog pops up on exiting GLI allowing the user to set the collecthome value for both GLI (in the user's GLI config.xml) and the server (in gsdlsite.cfg). 2. Collecthome line in gsdlsite.cfg is removed if it is the default GS collect folder. (Just as a recent commit stores an empty string for the open_collection element in the GLI config.xml file if no collection is left open on exiting GLI and the collect folder is the default GS collect directory.) 3. Some bug fixes.

File:

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

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

@@ -102 +102 @@
     static private String non_standard_collect_directory_path = null;
     static public String open_collection_file_path = null;
+    static public String gsdlsite_collecthome = "";
     /** A public reference to the FileAssociationManager. */
     static public FileAssociationManager assoc_man;
@@ -315 +316 @@
         if (fedora_info.isActive()) {
         popupFedoraInfo();
-        }   
-
+        }
         
+        // the no_load flag to GLI is processed at the end of handling open_collection_file_path
         open_collection_file_path = open_collection;
         if (open_collection_file_path == null) {
@@ -323 +324 @@
                 "general.open_collection"+Configuration.gliPropertyNameSuffix(), true);
         }
+        
+        initCollectDirectoryPath(open_collection); 
+        
         if (no_load || (isGsdlRemote && open_collection_file_path.equals(""))) {
         open_collection_file_path = null;
-        //      collectDirectoryHasChanged(); // make sure gsdlsite.cfg's collecthome defaults to GS' collect
-        }
-        
-        // If opening a collection outside the standard GS collect folder, need
-        // to open the non-standard collect folder that the collection resides in
-        if (!isGsdlRemote
-            && open_collection_file_path != null
-            && !open_collection_file_path.startsWith(getDefaultGSCollectDirectoryPath(true)))
-        {
-            File collectFolder = null;
-            
-            if(!open_collection_file_path.equals("")) {
-            
-                if(!open_collection_file_path.endsWith("gli.col")) { // then it's a collect folder
-                    collectFolder = new File(open_collection_file_path);
-                } else {
-                    // the filepath is a gli.col file. To get the collect folder: the 1st level
-                    // up is collection folder, 2 two levels up is the containing collect folder
-                    collectFolder = new File(open_collection_file_path).getParentFile().getParentFile();
-                }   
-            
-                // Need to deal with colgroups as well: while there's an etc/collect.cfg in the current
-                // collectFolder, move one level up
-                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();          
-                }
-            }
-            
-            if(collectFolder == null || !collectFolder.exists()) {
-                // if GLI config file specified no collectDir  (open_collection_file_path is "")
-                // OR if dealing with a local server but the collectdir no longer exists, 
-                // use the default greenstone collect directory, and write that to affected files
-                
-                String defaultColDir = getDefaultGSCollectDirectoryPath(false); // no file separator at end
-                open_collection_file_path = defaultColDir;
-                
-                setCollectDirectoryPath(defaultColDir); // will ensure the required file separator at end
-                
-                Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(),
-                        true, "");
-                
-                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
-                            // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return
-                }
-            } else { // remote GS, or collect dir exists (all config files will already be set since last GLI session)
-                if(collectFolder == null) {
-                    setCollectDirectoryPath(getDefaultGSCollectDirectoryPath(false)); // no file separator at end
-                } else {
-                    setCollectDirectoryPath(collectFolder.getAbsolutePath()); // now set this as the current collect folder
-                }                   
-            }           
         }
         
@@ -711 +659 @@
     // Flush debug
     DebugStream.closeDebugStream();
-
+    
     // If we started a server, we should try to stop it.
-    if (LocalLibraryServer.isRunning() == true) {
+    if (LocalLibraryServer.isRunning() == true) {       
         LocalLibraryServer.stop();
     }
@@ -751 +699 @@
     
     }
+    
+    // if we need to know whether the local server we are running is server.exe vs apache web server
+    static public boolean isPersistentServer() {
+        return (!isGsdlRemote && LocalLibraryServer.isPersistentServer());
+    }
 
     /** Returns the path of the Greenstone "collect" directory. */
@@ -835 +788 @@
     }
 
+
+    public static void initCollectDirectoryPath(String open_collection) {       
+        String defaultColdir = getDefaultGSCollectDirectoryPath(false); // no file separator at end
+        String coldir = defaultColdir;
+        // If local GS and opening a collection outside the standard GS collect folder,
+        // need to open the non-standard collect folder that the collection resides in
+        if (!isGsdlRemote 
+                && !open_collection_file_path.startsWith(defaultColdir))
+        {
+            File collectFolder = null;
+            
+            if(!open_collection_file_path.equals("")) {         
+                if(!open_collection_file_path.endsWith("gli.col")) { // then it's a collect folder
+                    collectFolder = new File(open_collection_file_path);
+                } else {
+                    // the filepath is a gli.col file. To get the collect folder: the 1st level up
+                    // is the collection folder, 2 two levels up is the containing collect folder
+                    collectFolder = new File(open_collection_file_path).getParentFile().getParentFile();
+                }   
+            
+                // Need to deal with colgroups as well: while there's an etc/collect.cfg
+                // in the current collectFolder, move one level up
+                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();          
+                }
+            }       
+            
+            if(collectFolder == null || !collectFolder.exists()) {
+                // if GLI config file specified no collectDir (open_collection_file_path is "")
+                // OR 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 = defaultColdir;      // default GS collect dir
+                // Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), true, "");
+            } else { // use the coldir value specified in the flags to GLI or from the last GLI session             
+                coldir = collectFolder.getAbsolutePath();
+            }           
+            // set it as the current folder
+            setCollectDirectoryPath(coldir); // will ensure the required file separator at end
+        }
+        
+        if(!isGsdlRemote) {
+            // LocalLibraryServer would  already have set glisite.cfg to the correct collecthome for server.exe
+            // Here we set collecthome in gsdl(3)site.cfg for the GS2 apache web server and GS3 tomcat server
+            String gsdlsitecfg = getGsdlSiteConfigFile();           
+            // update the gsdlsite config file and store the old value for use when we exit GLI
+            if(coldir.equals(defaultColdir)) {              
+                gsdlsite_collecthome = Utility.updatePropertyConfigFile(
+                    gsdlsitecfg, "collecthome", null);                      
+            } else {
+                gsdlsite_collecthome = Utility.updatePropertyConfigFile(
+                    gsdlsitecfg, "collecthome", coldir); // no file separator
+                    // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return
+            }
+        }       
+    }
+   
+    /** depending on the version of GS being run, return the path to the current GS' installation's gsdl(3)site.cfg */
+    public static String getGsdlSiteConfigFile() {
+        if(Gatherer.GS3) { // web/WEB-INF/cgi/gsdl3site.cfg
+            return Configuration.gsdl3_path + File.separator + "WEB-INF" 
+                + File.separator + "cgi" + File.separator + "gsdl3site.cfg";
+        } else { // cgi-bin/gsdlsite.cfg
+            return Configuration.gsdl_path + File.separator 
+                + "cgi-bin" + File.separator + "gsdlsite.cfg";
+        }
+    }
 
     public static void collectDirectoryHasChanged(
@@ -885 +906 @@
                 return;
             }   
-
-            String gsdlsitecfg = "";
-            if(Gatherer.GS3) { // web/WEB-INF/cgi/gsdl3site.cfg
-                gsdlsitecfg = Configuration.gsdl3_path + File.separator + "WEB-INF" 
-                    + File.separator + "cgi" + File.separator + "gsdl3site.cfg";
-            } else { // cgi-bin/gsdlsite.cfg
-                gsdlsitecfg = Configuration.gsdl_path + File.separator 
-                    + "cgi-bin" + File.separator + "gsdlsite.cfg";
-            }
-
+            
             // non-destructive update of gsdl(3)site.cfg (comments preserved)
             String collectDir = Gatherer.getCollectDirectoryPath();
             //collectDir = "\"" + collectDir.substring(0, collectDir.length()-1) + "\""; // remove file separator at end    
             collectDir = collectDir.substring(0, collectDir.length()-1); // remove file separator at end    
-            Utility.updatePropertyConfigFile(gsdlsitecfg, "collecthome", collectDir);
+            Utility.updatePropertyConfigFile(getGsdlSiteConfigFile(), "collecthome", collectDir);
                     // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return