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

Timestamp:

2010-08-24T19:49:00+12:00 (14 years ago)

Author:

ak19

Message:

More changes for ticket 152: making the collectdir moveable. When using server.exe, if GLI was last shutdown when another collectdir was active, this needs to be read in from the user config.xml by GLI, and server.exe needs to use it.

File:

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

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

@@ -708 +708 @@
     }
 
-    /** Returns the path of the Greenstone "collect" directory. */
+    /** Returns the path of the current collect directory. */
     static public String getCollectDirectoryPath()
     {
@@ -714 +714 @@
         return non_standard_collect_directory_path;
     }
-
-    if (!GS3) {
-        return Configuration.gsdl_path + "collect" + File.separator;
-    }
-    else {
-        return getSitesDirectoryPath() + Configuration.site_name + File.separator + "collect" + File.separator;
-    }
-    }
-
+    
+    return getDefaultGSCollectDirectoryPath();
+    
+    }
+
+    /** Returns the path of the Greenstone "collect" directory. */
+    static public String getDefaultGSCollectDirectoryPath() {
+        if (!GS3) {
+            return Configuration.gsdl_path + "collect" + File.separator;
+        }
+        else {
+            return getSitesDirectoryPath() + Configuration.site_name + File.separator + "collect" + File.separator;
+        }
+    }   
 
     /** Returns the path of the GLI directory. */
@@ -833 +838 @@
     // 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);