Changeset 24375 for main/trunk/greenstone2/bin
- Timestamp:
- 2011-08-09T17:35:09+12:00 (13 years ago)
- Location:
- main/trunk/greenstone2/bin/script
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/bin/script/gsConvert.pl
r24371 r24375 91 91 my $faillogfile=""; 92 92 my $timeout=0; 93 my $verbosity=0; 93 94 94 95 sub main … … 131 132 print_usage(); 132 133 } 133 134 135 $verbosity=$verbose if defined $verbose; 136 134 137 # Make sure the input file exists and can be opened for reading 135 138 if (scalar(@ARGV!=1)) { … … 521 524 522 525 my $wvware_status = 0; 523 526 524 527 # need to ensure that the path to perl is quoted (in case there's spaces in it) 525 my $launch_cmd = "\"".&util::get_perl_exec()."\" -S wvware.pl $input_filename $output_filestem $faillogfile $ timeout";528 my $launch_cmd = "\"".&util::get_perl_exec()."\" -S wvware.pl $input_filename $output_filestem $faillogfile $verbosity $timeout"; 526 529 527 530 # print STDERR "***** wvware launch cmd = $launch_cmd\n"; -
main/trunk/greenstone2/bin/script/wvware.pl
r24371 r24375 50 50 my ($argc,@argv) = @_; 51 51 52 if (($argc<2 || $argc> 4) || (($argc==1) && ($argv[0] =~ m/^--?h(elp)?$/))) {52 if (($argc<2 || $argc>5) || (($argc==1) && ($argv[0] =~ m/^--?h(elp)?$/))) { 53 53 my ($progname) = ($0 =~ m/^.*[\/|\\](.*?)$/); 54 54 55 55 print STDERR "\n"; 56 print STDERR "Usage: $progname <input-filename> <output-filestem> [<fail-log-file>] [ timeout]\n";56 print STDERR "Usage: $progname <input-filename> <output-filestem> [<fail-log-file>] [<verbosity>] [<timeout>]\n"; 57 57 print STDERR "\n"; 58 58 … … 63 63 my $output_filestem = $argv[1]; 64 64 my $faillogfile=""; 65 my $timeout=0; 65 my $verbosity=0; 66 my $timeout=0; 67 66 68 if($argc >= 3) { 67 69 $faillogfile= $argv[2]; 68 70 } 69 if($argc >= 4) { 70 $timeout = $argv[3]; 71 if($argc >= 4) { 72 $verbosity = $argv[3]; 73 } 74 if($argc >= 5) { 75 $timeout = $argv[4]; 71 76 } 72 77 … … 84 89 if(-d $gnome_dir) { 85 90 $ENV{'GEXTGNOME'} = $gnome_dir; 86 } else { 87 print STDERR "**** No gnome-lib(-minimal) ext folder detected.\n"; 88 print STDERR "**** Trying to run wvware without its libraries....\n"; 91 } elsif ($verbosity > 2) { 92 print STDERR "No gnome-lib(-minimal) ext folder detected. Trying to run wvware without its libraries....\n"; 89 93 } 90 94 }
Note:
See TracChangeset
for help on using the changeset viewer.