Changeset 13322

Timestamp:

2006-11-24T11:50:32+13:00 (17 years ago)

Author:

kjdon

Message:

allowed new passing in of a directory to useWget - will cd to this dir before running the wget command

File:

• trunk/gsdl/perllib/downloaders/WgetDownload.pm (modified) (3 diffs)

trunk/gsdl/perllib/downloaders/WgetDownload.pm

@@ -35 +35 @@
 use strict;
 use IPC::Open2;
+use Cwd;
 
 sub BEGIN {
@@ -126 +127 @@
 sub useWget
 {
-    my ($self, $cmdWget,$blnShow) = @_;
+    my ($self, $cmdWget,$blnShow, $working_dir) = @_;
 
     my ($strReadIn,$strLine,$command);
     $strReadIn = "" unless defined $strReadIn;
 
+    my $current_dir = cwd();
+    my $changed_dir = 0;
+    if (defined $working_dir && -e $working_dir) {
+    chdir "$working_dir";
+    $changed_dir = 1;
+    }
     my $wget_file_path = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wget");
     $command = "\"$wget_file_path\" $cmdWget |";
@@ -147 +154 @@
 
     close(WIN);
-
+    if ($changed_dir) {
+    chdir $current_dir;
+    }
+    
     return $strReadIn;
 }