Changeset 10244

Timestamp:

2005-07-13T15:00:55+12:00 (19 years ago)

Author:

mdewsnip

Message:

A few fixes to previous changes for building collections remotely using a local GLI.

File:

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

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

@@ -90 +90 @@
 
     static public boolean isApplet = false;
-    static public boolean isGsdlRemote = true;
+    static public boolean isGsdlRemote = false;
     static public String cgiBase = "";
 
@@ -128 +128 @@
     }
 
+    // Set the Greenstone path and collect directory specially when running with a remote Greenstone
+    if (isGsdlRemote) {
+        go.gsdl_path = Utility.getGLIUserFolder() + File.separator;
+        Gatherer.setCollectDirectoryPath(go.gsdl_path + "collect" + File.separator);
+    }
+
+    // Users may specify a non-standard collect directory (eg. when running one GLI in a network environment)
     if (go.collect_directory_path != null) {
-        // Use non-standard collect directory (for when running one GLI in a network environment)
         Gatherer.setCollectDirectoryPath(go.collect_directory_path);
     }
@@ -137 +143 @@
         File gli_user_directory = Utility.getGLIUserFolder();
 
-        Utility.BASE_DIR = gli_user_directory.toString();
-        if (!Utility.BASE_DIR.endsWith(File.separator)) {
-        Utility.BASE_DIR += File.separator;
-        }
-
+        Utility.BASE_DIR = go.gsdl_path;
         Utility.METADATA_DIR = Utility.BASE_DIR + "metadata" + File.separator;
         Utility.TMP_DIR = Utility.BASE_DIR + "tmp" + File.separator;
@@ -149 +151 @@
         Configuration.GS3_CONFIG_XML = "config3Remote.xml";
 
-        Gatherer.setCollectDirectoryPath(go.gsdl_path + "collect" + File.separator);
         File col_dir = new File(Gatherer.getCollectDirectoryPath());
         if (!col_dir.exists()) {
-
         if (JarTools.isInJar(Utility.COLLECT_ZIP)) {
             // Dig out collect.zip from JAR file and unzip it (thereby