Changeset 17530 for gsdl/trunk/perllib

Timestamp:

2008-10-14T17:25:27+13:00 (16 years ago)

Author:

ak19

Message:

Fixed not being able to run wget from the cmd-line via downloadfrom.pl on Linux (since the cache-dir was empty, the -P flag took the url to download from to be the directory-prefix and this made wget assume that the url itself was missing). Tested that wget process is killed upon Ctrl-C being pressed.

File:

• gsdl/trunk/perllib/downloaders/WebDownload.pm (modified) (1 diff)

gsdl/trunk/perllib/downloaders/WebDownload.pm

@@ -105 +105 @@
       
     # Setup the command for using wget
-     my $cache_dir = "";
-    if ($ENV{'GSDLOS'} eq "windows") {    
-    $cache_dir = "-P \"".$hashGeneralOptions->{"cache_dir"}."\" ";
-    }
-    else{
-        $cache_dir = "-P ".$hashGeneralOptions->{"cache_dir"};
-    }
-
+    my $cache_dir = "";
+    if($hashGeneralOptions->{'cache_dir'}) { # don't provide the prefix-dir flag to wget unless the cache_dir is specified
+    if ($ENV{'GSDLOS'} eq "windows") {    
+        $cache_dir = "-P \"".$hashGeneralOptions->{'cache_dir'}."\" ";
+    }
+    else {
+        $cache_dir = "-P ".$hashGeneralOptions->{'cache_dir'};
+    }
+    }
     #my $cmdWget = "-N -k -x -t 2 -P \"".$hashGeneralOptions->{"cache_dir"}."\" $strWgetOptions $strOptions ".$self->{'url'};
     my $cmdWget = "-N -k -x -t 2  $strWgetOptions $strOptions $cache_dir " .$self->{'url'};   
-    
+
     # Download the web pages
-    # print "Strat download from $self->{'url'}...\n";
+    # print "Start download from $self->{'url'}...\n";
     print STDERR "<<Undefined Maximum>>\n";