Changeset 13016 for trunk/gli

Timestamp:

2006-10-05T17:14:59+13:00 (18 years ago)

Author:

mdewsnip

Message:

Changed to use the GSDLOS argument now passed in, so downloading should now work on all OSs.

Location:

trunk/gli/src/org/greenstone/gatherer/download

Files:

• DownloadJob.java (modified) (1 diff)
• ServerInfoDialog.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

@@ -245 +245 @@
         else {
         if (proxy_url != null && !proxy_url.equals("")) {           
+            // Specify proxies as environment variables
+            // Need to manually specify GSDLHOME and GSDLOS also
             env = new String[4];
                     proxy_url = proxy_url.replaceAll("http://","");
             env[0] = "http_proxy=http://"+proxy_url;
             env[1] = "ftp_proxy=ftp://"+proxy_url;
-            env[2] = "GSDLHOME="+Configuration.gsdl_path;
-            env[3] = "GSDLOS="+System.getProperty("os.name");
-            prcs = rt.exec(cmd,env); 
+            env[2] = "GSDLHOME=" + Configuration.gsdl_path;
+            env[3] = "GSDLOS=" + Gatherer.client_operating_system;
+            prcs = rt.exec(cmd, env); 
         } 
-        else {       
-            env = new String[2];
-         
-            env[0] = "GSDLHOME="+Configuration.gsdl_path;
-            env[1] = "GSDLOS="+System.getProperty("os.name");
-            prcs = rt.exec(cmd,env); 
-        } 
-        
+        else {
+            // Will inherit the GLI's environment, with GSDLHOME and GSDLOS set
+            prcs = rt.exec(cmd);
+        }
         }
  

trunk/gli/src/org/greenstone/gatherer/download/ServerInfoDialog.java

@@ -12 +12 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.LocalGreenstone;
 import org.greenstone.gatherer.gui.*;
@@ -113 +114 @@
         }
         else {
-        ArrayList env_list = new ArrayList();
         if (proxy_url != null && !proxy_url.equals("")) {           
+            // Specify proxies as environment variables
+            // Need to manually specify GSDLHOME and GSDLOS also
+            env = new String[4];
                     proxy_url = proxy_url.replaceAll("http://","");
-            env_list.add("http_proxy=http://"+proxy_url);
-            env_list.add("ftp_proxy=ftp://"+proxy_url);
+            env[0] = "http_proxy=http://"+proxy_url;
+            env[1] = "ftp_proxy=ftp://"+proxy_url;
+            env[2] = "GSDLHOME=" + Configuration.gsdl_path;
+            env[3] = "GSDLOS=" + Gatherer.client_operating_system;
+            prcs = rt.exec(command, env); 
+        } 
+        else {
+            // Will inherit the GLI's environment, with GSDLHOME and GSDLOS set
+            prcs = rt.exec(command);
         }
-        env_list.add("GSDLHOME="+Configuration.gsdl_path);
-        env_list.add("GSDLOS="+System.getProperty("os.name"));
-        env = (String []) env_list.toArray(new String[0]);
-        prcs = rt.exec(command,env); 
-        
         }