Changeset 31876

Timestamp:

2017-08-11T16:13:34+12:00 (7 years ago)

Author:

ak19

Message:

1. Getting the recently added util::print_env() subroutine, which has now already helped in debugging a 2nd issue, to work on Windows. Keeping the same changes for linux too. 2. Dr Bainbridge said that single quoting the string https in dictionary props files would be better.

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -586 +586 @@
     
     if (scalar(@envvars) == 0) {
-    #print $handle "@@@ All env vars requested\n";    
-    
-    my $output;
-    if (defined $ENV{'GSDLOS'} && $ENV{'GSDLOS'} =~ m/windows/) {
-        $output = `set`;
-    }
-    else {
-        $output = `env`;
-    }
-    
-    print $handle "@@@ Environment was:\n********\n$output\n********\n";
+        #print $handle "@@@ All env vars requested\n";    
+        
+        my $output = "";
+
+        print $handle "@@@ Environment was:\n********\n";       
+        foreach my $envvar (sort keys(%ENV)) {
+            if(defined $ENV{$envvar}) {
+                print $handle "\t$envvar = $ENV{$envvar}\n";
+            } else {
+            print $handle "\t$envvar = \n";
+            }   
+        }
+        print $handle "********\n"; 
     } else {
     print $handle "@@@ Environment was:\n********\n";
@@ -602 +604 @@
         if(defined $ENV{$envvar}) {
         print $handle "\t$envvar = ".$ENV{$envvar}."\n";
-        } else {
-        $envvar = uc($envvar);
-        if(defined $ENV{$envvar}) {
-            print $handle "\t$envvar = ".$ENV{$envvar}."\n";
-        } else {
-            print $handle "Env var $envvar was not set\n";
-        }
+        } else {        
+            print $handle "Env var '$envvar' was not set\n";        
         }
     }