Changeset 32826

Timestamp:

2019-02-27T18:55:36+13:00 (5 years ago)

Author:

ak19

Message:

GLI build log display removes lines starting with unrecognised elements/tags, but when we wget a webpage when activating/deactivating and print out that webpage's contents for debugging, we'd like to see the lines starting with tags too since they can be the most useful. Don't want to make GLI behave differently, so servercontrol changes such tags to be embedded in [] instead of <> so that GLI still dispklays the informative lines

File:

• main/trunk/greenstone2/perllib/servercontrol.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/servercontrol.pm

@@ -207 +207 @@
         my $resultstr;
         # Read in the entire contents of the file in one hit
-        sysread(FIN, $resultstr, -s FIN);       
+        ##sysread(FIN, $resultstr, -s FIN);
+        # GLI GBuildProgressMonitor.hasSignalledStop() removes any lines that start with elements it doesn't recognise
+        # but we want to see the lines with HTML tags as they are the most interesting: they embed success/failure messages
+        # So read line by line from the downloaded web page and replace <> with [] so that GLI can display these lines too
+        while (my $line = <FIN>) {
+            chomp $line;
+            $line =~ s@<@[@g;
+            $line =~ s@>@]@g;
+            $resultstr .= "$line\n";
+        }
         close(FIN);
         &FileUtils::removeFiles($tmpfilename); # get rid of the ping response's temporary html file we downloaded