Changeset 31823 for main

Show
Ignore:
Timestamp:
26.07.2017 20:00:53 (2 years ago)
Author:
ak19
Message:

Another bugfix to GLI's downloadjob display: on Linux, the number of files already downloaded weren't being displayed, whereas this worked on Windows. Wget seems to use backtick or single quote character to bookend names of files already downloaded. We used to only process the backtick before.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

    r31820 r31823  
    11101110            // If line contains "/s) - `" set currently  
    11111111            // downloading url to "Download Complete". 
    1112             else if(line.lastIndexOf("/s) - `") != -1) { 
    1113                 String current_file_downloading = line.substring(line.indexOf("`") + 1, line.lastIndexOf("'")); 
     1112            // Currently: on windows ` marks start quote of downloaded file, but on linux ' marks it 
     1113            else if(line.lastIndexOf("/s) - `") != -1 || line.lastIndexOf("/s) - '") != -1) { 
     1114                String startChar = (line.lastIndexOf("/s) - `") != -1) ? "`" : "'"; 
     1115                String current_file_downloading = line.substring(line.indexOf(startChar) + 1, line.lastIndexOf("'")); 
    11141116                if(!ignore_for_robots) { 
    11151117                DebugStream.println("Not ignore for robots");