Changeset 31852 for main/trunk/gli

Show
Ignore:
Timestamp:
04.08.2017 19:05:08 (2 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/findjava.bat

    r25678 r31852  
    4646    del "%TMP%\set_java_home.bat" 
    4747 
     48    ::set JAVA_HOME=%GS_JAVA_HOME% 
     49    ::set PATH=%GS_JAVA_HOME%\bin;%PATH% 
     50     
    4851:: found java, JAVA_EXECUTABLE and GS_JAVA_HOME env vars set, can exit this script 
    4952    goto exit 
     
    6568    set JAVA_EXECUTABLE=%JAVA_HOME%\bin\java 
    6669    set GS_JAVA_HOME=%JAVA_HOME% 
     70    ::set JAVA_HOME=%GS_JAVA_HOME% 
     71    ::set PATH=%GS_JAVA_HOME%\bin;%PATH% 
    6772    goto exit 
    6873 
     
    100105 
    101106endlocal & set JAVA_EXECUTABLE=%JAVA_EXECUTABLE%& set GS_JAVA_HOME=%GS_JAVA_HOME% 
     107::& set JAVA_HOME=%JAVA_HOME%& set PATH=%PATH% 
     108 
     109::echo ** JAVA_HOME: %JAVA_HOME% 
     110::echo ** PATH: %PATH% 
  • main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

    r31851 r31852  
    572572        Download current_download = (Download)download_map.get(mode); 
    573573        Argument arg_url = current_download.getArgument("url"); 
     574         
    574575        if(arg_url != null) { // it's null for z3950 and possibly for other downloaders 
    575             String url_str = arg_url.getValue(); 
     576            String url_str = arg_url.getValue();     
     577             
     578            // No longer following URL redirects, since some of this has been taken care of by wget 
     579            // For the rest, assume the user will get the URL right that they want to download from 
     580            /* 
    576581            String redirect_url_str = getRedirectURL(url_str); 
    577582             
     
    582587            updateArgument(arg_url, redirect_url_str); 
    583588            } 
     589            */ 
    584590        } 
     591         
    585592        getter.newDownloadJob((Download)download_map.get(mode) ,mode,proxy_url); 
    586593        } 
     
    815822        } 
    816823 
    817         str_url = getRedirectURL(str_url); // work out the real URL 
     824        //str_url = getRedirectURL(str_url); // work out the real URL 
    818825 
    819826        server_info = new ServerInfoDialog(str_url ,proxy_url, mode,(Download)download_map.get(mode));