Changeset 31513 for main/trunk/greenstone2/perllib/servercontrol.pm

Timestamp:

2017-03-14T15:30:24+13:00 (7 years ago)

Author:

ak19

Message:

servercontrol.pm uses established functions to generate tmpfiles in tmp directories, and then immediately deletes them after using them. Made some modifications for this in util.pm and added some extra helper functions there.

File:

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

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -140 +140 @@
 
     my $wget_file_path = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "wget");
-    my $tmpfilename = time . ".html"; # random name for file wherein we'll store the HTML page retrieved by 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
+        
     # https://www.gnu.org/software/wget/manual/wget.html
     # output-document set to - (STDOUT), so page is streamed to STDOUT
@@ -181 +182 @@
         # 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
         return 0;
     }
@@ -195 +197 @@
         sysread(FIN, $resultstr, -s FIN);       
         close(FIN);
-        &FileUtils::removeFiles("$tmpfilename");
+        &util::rm_tmp_file($tmpfilename); # will also remove any randomly named tmp directories containing the file
+        
         
         #$resultstr =~ s@.*gs_content\"\>@@s;   ## only true for default library servlet