Changeset 24375 for main/trunk/greenstone2

Timestamp:

2011-08-09T17:35:09+12:00 (13 years ago)

Author:

ak19

Message:

Added in verbosity option when launching wvware.pl, so that an unnecessary message can be suppressed at lower verbosity levels.

Location:

main/trunk/greenstone2/bin/script

Files:

• gsConvert.pl (modified) (3 diffs)
• wvware.pl (modified) (3 diffs)

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

@@ -91 +91 @@
 my $faillogfile="";
 my $timeout=0;
+my $verbosity=0;
 
 sub main
@@ -131 +132 @@
     print_usage();
     }
-      
+
+    $verbosity=$verbose if defined $verbose;
+     
     # Make sure the input file exists and can be opened for reading
     if (scalar(@ARGV!=1)) {
@@ -521 +524 @@
 
     my $wvware_status = 0;
-    
+    
     # need to ensure that the path to perl is quoted (in case there's spaces in it)
-    my $launch_cmd = "\"".&util::get_perl_exec()."\" -S wvware.pl $input_filename $output_filestem $faillogfile $timeout";    
+    my $launch_cmd = "\"".&util::get_perl_exec()."\" -S wvware.pl $input_filename $output_filestem $faillogfile $verbosity $timeout";    
 
 #    print STDERR "***** wvware launch cmd = $launch_cmd\n";

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

@@ -50 +50 @@
     my ($argc,@argv) = @_;
 
-    if (($argc<2 || $argc>4)  || (($argc==1) && ($argv[0] =~ m/^--?h(elp)?$/))) {
+    if (($argc<2 || $argc>5)  || (($argc==1) && ($argv[0] =~ m/^--?h(elp)?$/))) {
     my ($progname) = ($0 =~ m/^.*[\/|\\](.*?)$/);
 
     print STDERR "\n";
-    print STDERR "Usage: $progname <input-filename> <output-filestem> [<fail-log-file>] [timeout]\n";
+    print STDERR "Usage: $progname <input-filename> <output-filestem> [<fail-log-file>] [<verbosity>] [<timeout>]\n";
     print STDERR "\n";
 
@@ -63 +63 @@
     my $output_filestem = $argv[1];
     my $faillogfile="";
-    my $timeout=0;
+    my $verbosity=0;
+    my $timeout=0;
+    
     if($argc >= 3) {
     $faillogfile= $argv[2];
     }
-    if($argc >= 4) {
-    $timeout = $argv[3];
+    if($argc >= 4) {
+    $verbosity = $argv[3];
+    }
+    if($argc >= 5) {
+    $timeout = $argv[4];
     }
 
@@ -84 +89 @@
         if(-d $gnome_dir) {
         $ENV{'GEXTGNOME'} = $gnome_dir;
-        } else {
-        print STDERR "**** No gnome-lib(-minimal) ext folder detected.\n";
-        print STDERR "**** Trying to run wvware without its libraries....\n";
+        } elsif ($verbosity > 2) {
+        print STDERR "No gnome-lib(-minimal) ext folder detected. Trying to run wvware without its libraries....\n";
         }       
     }