Changeset 30531

Timestamp:

2016-05-12T17:42:40+12:00 (8 years ago)

Author:

ak19

Message:

Fixing up the wget command issued by servercontrol.pm so that it will work on Windows too. Ampersands in URL to wget need to be escaped to work in a subshell. For linux, nesting the ampersand in single quotes suffices. For windows, preceding the ampersand with a hat sign seems to work from DOS prompt. But nesting the entire wget command inside double quotes seems to work on both OS systems.

File:

• main/trunk/greenstone2/perllib/servercontrol.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -133 +133 @@
     }
     else {
-    # ampersands need to be escaped with single quotes
+    # ampersands need to be escaped 
+    # - with single quotes around it for linux for the cmd to run in bash subshell
+    # - with a ^ before it on windows for the cmd to run in a DOS prompt subshell
+    # - or the entire wget command should be nested double quotes (single quotes don't work on windows)
     my $wgetCommand = $command;
-    $wgetCommand =~ s@&@'&'@g;
 
     my $wget_file_path = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wget");
@@ -145 +147 @@
     # Searching for "perl backtick operator redirect stderr to stdout":
     # http://www.perlmonks.org/?node=How%20can%20I%20capture%20STDERR%20from%20an%20external%20command%3F
-    $wgetCommand = "\"$wget_file_path\" --output-document=- -T 5 -t 1 $library_url$wgetCommand 2>&1";   
-    #$wgetCommand = "\"$wget_file_path\" --spider -T 5 -t 1 $library_url$wgetCommand 2>&1"; # won't save page
+    $wgetCommand = "\"$wget_file_path\" --output-document=- -T 5 -t 1 \"$library_url$wgetCommand\" 2>&1";   
+    #$wgetCommand = "\"$wget_file_path\" --spider -T 5 -t 1 \"$library_url$wgetCommand\" 2>&1"; # won't save page
     my $response_content = `$wgetCommand`;
     my $response_code = undef;