Changeset 31863

Timestamp:

2017-08-09T19:23:08+12:00 (6 years ago)

Author:

ak19

Message:

Additional changes to previous commit so that the new util::print_env can print to the specificed output handle (STDERR, STDOUT or file).

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -27 +27 @@
 
 use strict;
+no strict 'refs'; # make an exception so we can use variables as filehandles
 use FileUtils;
 
@@ -582 +583 @@
 # debug aid
 sub print_env {
-    my @envvars = @_;
-
+    my ($handle, @envvars) = @_; # print to $handle, which can be STDERR/STDOUT/file, etc.
+    
     if (scalar(@envvars) == 0) {
-    print STDERR "@@@ No env vars requested\n";
-    
+    #print $handle "@@@ All env vars requested\n";    
     
     my $output;
@@ -596 +596 @@
     }
     
-    print STDERR "@@@ Environment was:\n********\n$output\n*******\n";
+    print $handle "@@@ Environment was:\n********\n$output\n********\n";
     } else {
-    print STDERR "@@@ Environment was:\n********\n";
+    print $handle "@@@ Environment was:\n********\n";
     foreach my $envvar (@envvars) {
         if(defined $ENV{$envvar}) {
-        print STDERR "\t$envvar = ".$ENV{$envvar}."\n";
+        print $handle "\t$envvar = ".$ENV{$envvar}."\n";
         } else {
         $envvar = uc($envvar);
         if(defined $ENV{$envvar}) {
-            print STDERR "\t$envvar = ".$ENV{$envvar}."\n";
+            print $handle "\t$envvar = ".$ENV{$envvar}."\n";
         } else {
-            print STDERR "Env var $envvar was not set\n";
+            print $handle "Env var $envvar was not set\n";
         }
         }
     }
-    print STDERR "@@@*******\n";
+    print $handle "********\n";
     }
 }