Changeset 10368

Timestamp:

2005-08-01T12:25:44+12:00 (19 years ago)

Author:

mdewsnip

Message:

Removed some occurrences of "gsdl_path", and added some checks so it is only used when a local Greenstone exists.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (1 diff)
• Gatherer.java (modified) (1 diff)
• gui/ExportAsPrompt.java (modified) (2 diffs)
• gui/WriteCDImagePrompt.java (modified) (1 diff)

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

@@ -685 +685 @@
     }
 
+    static public String getTmpDirectoryPath()
+    {
+    return gsdl_path + "tmp" + File.separator;
+    }
 
     static public String getWGetPath() {

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

@@ -253 +253 @@
 
         // Start up the local library server, if that's what we want
-        if (Utility.isWindows() && local_library_path != null && !GS3) {
+        if (Utility.isWindows() && local_library_path != null && !isGsdlRemote && !GS3) {
         LocalLibraryServer.start(gsdl_path, local_library_path);
         }

trunk/gli/src/org/greenstone/gatherer/gui/ExportAsPrompt.java

@@ -296 +296 @@
     command_parts_list.add(export_type);
     command_parts_list.add("-exportdir");
-    command_parts_list.add(Configuration.gsdl_path + "tmp" + File.separator);
+    command_parts_list.add(Configuration.getTmpDirectoryPath());
 
     if (cd_title.equals("")) {
@@ -344 +344 @@
     args[0] = coll_names.toString();
 
-    args[1] = Configuration.gsdl_path+"tmp"+File.separator;
+    args[1] = Configuration.getTmpDirectoryPath();
     if(cd_title.equals("")) {
         String export_type = (String)saveas_combobox.getSelectedItem();

trunk/gli/src/org/greenstone/gatherer/gui/WriteCDImagePrompt.java

@@ -318 +318 @@
     
     args[0] = coll_names.toString();
-    args[1] = Configuration.gsdl_path+"tmp"+File.separator;
+    args[1] = Configuration.getTmpDirectoryPath();
     if(cd_title.equals("")) {
         args[1] += "exported_collections";