Changeset 31852 for main/trunk/gli

Timestamp:

2017-08-04T19:05:08+12:00 (7 years ago)

Author:

ak19

Message:

Java code no longer works out what the ultimate URL to download from is, after all the redirects have been resolved. Wget seems to handle some of this, and for the rest, assume the user specificed URL is what the user is after

Location:

main/trunk/gli

Files:

• findjava.bat (modified) (3 diffs)
• src/org/greenstone/gatherer/gui/DownloadPane.java (modified) (3 diffs)

main/trunk/gli/findjava.bat

@@ -46 +46 @@
     del "%TMP%\set_java_home.bat"
 
+    ::set JAVA_HOME=%GS_JAVA_HOME%
+    ::set PATH=%GS_JAVA_HOME%\bin;%PATH%
+    
 :: found java, JAVA_EXECUTABLE and GS_JAVA_HOME env vars set, can exit this script
     goto exit
@@ -65 +68 @@
     set JAVA_EXECUTABLE=%JAVA_HOME%\bin\java
     set GS_JAVA_HOME=%JAVA_HOME%
+    ::set JAVA_HOME=%GS_JAVA_HOME%
+    ::set PATH=%GS_JAVA_HOME%\bin;%PATH%
     goto exit
 
@@ -100 +105 @@
 
 endlocal & set JAVA_EXECUTABLE=%JAVA_EXECUTABLE%& set GS_JAVA_HOME=%GS_JAVA_HOME%
+::& set JAVA_HOME=%JAVA_HOME%& set PATH=%PATH%
+
+::echo ** JAVA_HOME: %JAVA_HOME%
+::echo ** PATH: %PATH%

main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -572 +572 @@
         Download current_download = (Download)download_map.get(mode);
         Argument arg_url = current_download.getArgument("url");
+        
         if(arg_url != null) { // it's null for z3950 and possibly for other downloaders
-            String url_str = arg_url.getValue();
+            String url_str = arg_url.getValue();    
+            
+            // No longer following URL redirects, since some of this has been taken care of by wget
+            // For the rest, assume the user will get the URL right that they want to download from
+            /*
             String redirect_url_str = getRedirectURL(url_str);
             
@@ -582 +587 @@
             updateArgument(arg_url, redirect_url_str);
             }
+            */
         }
+        
         getter.newDownloadJob((Download)download_map.get(mode) ,mode,proxy_url);
         }
@@ -815 +822 @@
         }
 
-        str_url = getRedirectURL(str_url); // work out the real URL
+        //str_url = getRedirectURL(str_url); // work out the real URL
 
         server_info = new ServerInfoDialog(str_url ,proxy_url, mode,(Download)download_map.get(mode));