Changeset 31514

Timestamp:

2017-03-14T18:54:14+13:00 (7 years ago)

Author:

ak19

Message:

1. As advised by Dr Bainbridge, using open() instead of backtick operator to capture output when running wget command from servercontrol::config(). Tmpfile not created in randomly named subdir, as the tmpfile name itself is guaranteed to not have a naming clash. 2. Modifications to util in previous commit (rev 31513) were unnecessary. Putting them back. 3. Util's get-full-greenstone-url-prefix function is now also agnostic to http and https.

Location:

main/trunk/greenstone2/perllib

Files:

• servercontrol.pm (modified) (4 diffs)
• util.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -140 +140 @@
 
     my $wget_file_path = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wget");
-    my $tmpfilename = &util::get_tmp_filename(".html", 1); # random file name with html extension in timestamped-tmpdir location (2nd param=1) 
-                                                            # wherein we'll store the HTML page retrieved by wget
-        
+    my $tmpfilename = &util::get_tmp_filename(".html"); # random file name with html extension in tmp location in which we'll store the HTML page retrieved by wget
+    
     # https://www.gnu.org/software/wget/manual/wget.html
     # output-document set to - (STDOUT), so page is streamed to STDOUT
@@ -154 +153 @@
     
     ##print STDERR "@@@@ $wgetCommand\n";
-
-    my $response_content = `$wgetCommand`;
+    
+    my $response_content;
     my $response_code = undef;
+    #my $response_content = `$wgetCommand`; # Dr Bainbridge advises against using backticks for running a process. If capturing std output, use open():
+    if (open(PIN, "$wgetCommand |")) {
+        while (defined (my $perl_output_line = <PIN>)) {
+            $response_content = $response_content . $perl_output_line;
+        }
+        close(PIN);
+    } else {
+        print STDERR "servercontrol.pm::config() failed to run $wgetCommand\n";
+    }
+    
+    
     my @lines = split( /\n/, $response_content );
     foreach my $line (@lines) {
@@ -182 +192 @@
         # server not running
         $self->print_msg("*** Server not running. $library_url$command\n", 3);
-        &util::rm_tmp_file($tmpfilename); # will also remove any randomly named tmp directories containing the file
+        &FileUtils::removeFiles($tmpfilename); # get rid of the ping response's temporary html file we downloaded
         return 0;
     }
@@ -197 +207 @@
         sysread(FIN, $resultstr, -s FIN);       
         close(FIN);
-        &util::rm_tmp_file($tmpfilename); # will also remove any randomly named tmp directories containing the file
+        &FileUtils::removeFiles($tmpfilename); # get rid of the ping response's temporary html file we downloaded
         
         

main/trunk/greenstone2/perllib/util.pm

@@ -276 +276 @@
 {
     my $file_ext = shift(@_) || undef;
-    my $use_timestamped_tmp_dir = shift(@_) || 0; # else defaults to using super directory named "tmp"
 
     my $opt_dot_file_ext = "";
@@ -291 +290 @@
     }
 
-    my $tmpdir = $use_timestamped_tmp_dir ? &util::get_timestamped_tmp_folder() : &util::determine_tmp_dir(0);
+    my $tmpdir = &util::determine_tmp_dir(0);
 
     my $count = 1000;
@@ -387 +386 @@
 
     return $tmp_dirname;
-}
-
-sub rm_tmp_file
-{
-    my $tmpfilename = shift(@_);
-    
-    my $tmpdir = &util::get_parent_folder($tmpfilename);
-    
-    &FileUtils::removeFiles($tmpfilename);  
-    # if the containing folder is a randomly named temporary subdirectory, remove it
-    # but not if it is the temporary "tmp" super directory itself.
-    if($tmpdir !~ m@^tmp(\\|\/)*$@) {
-        &FileUtils::removeFilesRecursive($tmpdir);
-    }
 }
 
@@ -1298 +1283 @@
         my $host = $uri->host;
         #print STDERR "@@@@@ host: $host\n";
-        if($url =~ m/http:\/\/$host(\/)?$/) {
+        if($url =~ m/https?:\/\/$host(\/)?$/) {
             #if($url !~ m/http:\/\/$host:$portnumber(\/)?/ || $url =~ m/http:\/\/$host(\/)?$/) {
             # (if the URL does not contain the portnumber, OR if the port is implicitly 80 and)                 
@@ -1338 +1323 @@
         while (defined (my $perl_output_line = <PIN>)) {
 
-        if($perl_output_line =~ m@http:\/\/(\S*)@) { # grab all the non-whitespace chars
-            $url="http://".$1;
+        if($perl_output_line =~ m@(https?):\/\/(\S*)@) { # grab all the non-whitespace chars
+            $url="$1://".$2; # preserve the http protocol #$url="http://".$1;
         }
         }
@@ -1345 +1330 @@
     } else {
         print STDERR "util::get_library_URL() failed to run $perl_command to work out library URL for $gs_mode\n";
-    }       
+    }
     }