Changeset 36060

Timestamp:

2022-02-21T13:21:24+13:00 (2 years ago)

Author:

kjdon

Message:

only output the comment about setting site to localsite if verbosity > 3. We don't want it when eg we are printing out the xml list of options, as its prevents teh output from being parsed.

Location:

main/trunk/greenstone2/bin/script

Files:

• activate.pl (modified) (1 diff)
• buildcol.pl (modified) (1 diff)
• import.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/activate.pl

@@ -191 +191 @@
         if (!defined $site || $site eq "") {
         $site = "localsite";
-        print STDOUT "setting site to localsite as GSDL3SRCHOME was set\n";
+        print STDOUT "setting site to localsite as GSDL3SRCHOME was set\n" if $default_verbosity > 3;
         }
     }

main/trunk/greenstone2/bin/script/buildcol.pl

@@ -362 +362 @@
             if (!defined $buildcolutils->{'site'} || $buildcolutils->{'site'} eq "") {
                 $buildcolutils->{'site'} = "localsite";
-        print STDOUT "setting site to localsite as GSDL3SRCHOME was set\n";
+        print STDOUT "setting site to localsite as GSDL3SRCHOME was set\n" if ($buildcolutils->{'verbosity'} && $buildcolutils->{'verbosity'} > 3);
             }        
   }

main/trunk/greenstone2/bin/script/import.pl

@@ -234 +234 @@
         if (!defined $inexport->{'site'} || $inexport->{'site'} eq "") {
         $inexport->{'site'} = "localsite";
-        print STDOUT "setting site to localsite as GSDL3SRCHOME was set\n";
+        print STDOUT "setting site to localsite as GSDL3SRCHOME was set\n" if $inexport->{'verbosity'} > 3;
         }
   }