Changeset 10362

Timestamp:

2005-08-01T10:59:47+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now sets the gli directory path correctly.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• GathererApplet.java (modified) (2 diffs)
• GathererProg.java (modified) (1 diff)

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

@@ -137 +137 @@
         setCollectDirectoryPath(go.gsdl_path + "collect" + File.separator);
     }
-    else {
-        setGLIDirectoryPath(go.gsdl_path + "gli");
-    }
 
     // Users may specify a non-standard collect directory (eg. when running one GLI in a network environment)

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

@@ -104 +104 @@
         }
     Gatherer.setGLIUserDirectoryPath(gli_user_directory_path);
-    Gatherer.setGLIDirectoryPath(gli_user_directory_path);
 
     // Ensure the GLI user directory exists
@@ -111 +110 @@
         System.err.println("Error: Unable to make directory: " + gli_user_directory.toString());
     }
+
+    // If we're running as an applet we don't have a local GLI, so use the user directory path as the GLI path
+    Gatherer.setGLIDirectoryPath(gli_user_directory_path);
 
     // Set some global variables so we know how we're running

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

@@ -77 +77 @@
     }
 
+    // We have a local GLI
+    Gatherer.setGLIDirectoryPath(System.getProperty("user.dir") + File.separator);
+
     // Create an instance of the Gatherer class, which will parse the args and prepare the rest of the GLI
     Gatherer gatherer = new Gatherer(args);