Changeset 35174

Timestamp:

2021-05-20T15:10:20+12:00 (3 years ago)

Author:

kjdon

Message:

gsConvert.pl now prints out the command it will run, if verbosity > 2

File:

• main/trunk/greenstone2/bin/script/gsConvert.pl (modified) (19 diffs)

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

@@ -69 +69 @@
 my $pdf_allow_images_only;
 my $windows_scripting;
+my $verbosity;
 my $enc;
 
@@ -92 +93 @@
     print STDERR "\t\t-pdf_complex is set\n";
     print STDERR "\t-pdf_dpi\tSet the resolution in DPI of background images produced by xpdf's pdftohtml\n";
+    print STDERR "\t-verbosity\tSet verbosity to 3 to see the commands that are run\n";
     exit(1);
 }
@@ -97 +99 @@
 my $faillogfile="";
 my $timeout=0;
-my $verbosity=0;
 
 sub main
 {
     my (@ARGV) = @_;
-    my ($input_type,$output_type,$verbose);
+    my ($input_type,$output_type);
 
     # Dynamically figure out what the --type option can support, based on whether -windows_scripting 
@@ -126 +127 @@
              'output/(auto|html|text|pagedimg).*/', \$output_type, # regex includes html_multi and (paged_)pretty_html besides html, as well as pagedimgtxt_<imgext> besides pagedimg_<imgext>
              'timeout/\d+/0',\$timeout,
-             'verbose/\d+/0', \$verbose,
+             'verbosity/\d+/1', \$verbosity,
              'windows_scripting',\$windows_scripting,
              'use_strings', \$use_strings,
@@ -141 +142 @@
     }
 
-    $verbosity=$verbose if defined $verbose;
-     
     # Make sure the input file exists and can be opened for reading
     if (scalar(@ARGV!=1)) {
@@ -454 +453 @@
         if ($ENV{'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000);
 
+        print STDERR "gsConvert.pl: About to run cmd $cmd\n" if $verbosity >2;
         if (system($cmd) !=0) {
         print STDERR "Powerpoint VB Scripting convert failed\n";
@@ -472 +472 @@
 
     # execute the command
+    print STDERR "gsConvert.pl: About to run cmd $cmd\n" if $verbosity >2;
     $!=0;
     if (system($cmd)!=0)
@@ -507 +508 @@
     
     # execute the command
+    print STDERR "gsConvert.pl: About to run cmd $cmd\n" if $verbosity >2;
+
     $!=0;
     if (system($cmd)!=0)
@@ -586 +589 @@
 
 #    print STDERR "***** wvware launch cmd = $launch_cmd\n";
+    print STDERR "gsConvert.pl: About to run cmd $launch_cmd\n" if $verbosity >2;
 
     $wvware_status = system($launch_cmd)/256;
@@ -636 +640 @@
     $cmd .= " 2> \"$output_filestem.err\""
         if ($ENV {'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000);    
-    #print STDERR "@@@@@@@@@ cmd=$cmd\n";
     
     # execute the command
+    print STDERR "gsConvert.pl: About to run cmd $cmd\n" if $verbosity >2;
+
     $!=0;
     if (system($cmd)!=0)
@@ -709 +714 @@
 
     # execute the command
+    print STDERR "gsConvert.pl: About to run cmd $cmd\n" if $verbosity >2;
+    
     $!=0;
     if (system($cmd)!=0)
@@ -831 +838 @@
     }
 
+    print STDERR "gsConvert.pl: About to run cmd $cmd\n" if $verbosity >2;
     $!=0;
-
     my $retval=system($cmd);
     if ($retval!=0)
@@ -913 +920 @@
     }
 
-    #print STDERR "@@@@ Running command: $cmd\n";
-
+    print STDERR "gsConvert.pl: About to run cmd $cmd\n" if $verbosity >2;
     $!=0;
     my $retval=system($cmd);
@@ -974 +980 @@
     my $imagick_cmd = "\"".&util::get_perl_exec()."\" -S gs-magick.pl";
     $imagick_cmd = $imagick_cmd." --verbosity=$verbosity" if defined $verbosity;
+    print STDERR "gsConvert.pl: About to run cmd $imagick_cmd\n" if $verbosity >2;
     my $result = `$imagick_cmd identify 2>&1`;
 
@@ -1008 +1015 @@
     # with quoting when GSDLHOME might contain spaces) but assume
     # that the PATH is set up correctly
+    print STDERR "gsConvert.pl: About to run cmd $cmd\n" if $verbosity >2;
     $!=0;
     my $retval=system($cmd);
@@ -1072 +1080 @@
     $cmd .= " -nopgbrk";
     }
-    # Avoid the silly solitary carriage returns (CR in Notepad) at the end
-    # of lines that ends up as \n appended to the doc title
-    # by setting the end of line marker to unix style solitary newline (LF or \n),
-    # which doesn't end up in the doc title
-    $cmd .= " -eol unix";
+    # Avoid the silly solitary carriage returns (CR in Notepad) at the end
+    # of lines that ends up as \n appended to the doc title
+    # by setting the end of line marker to unix style solitary newline (LF or \n),
+    # which doesn't end up in the doc title
+    $cmd .= " -eol unix";
     $cmd .= " \"$input_filename\" \"$output_filestem.text\"";    
-
-    print STDERR "@@@@ Running command: $cmd\n";
-    
-    return _run_pdf_to_text_cmd($cmd, $output_filestem);
+    
+    return _run_pdf_to_text_cmd($cmd, $output_filestem);
 }
 
@@ -1091 +1097 @@
     my $cmd = "pdftotext \"$input_filename\" \"$output_filestem.text\"";
     
-    return _run_pdf_to_text_cmd($cmd, $output_filestem);
+    return _run_pdf_to_text_cmd($cmd, $output_filestem);
 }
 
 sub _run_pdf_to_text_cmd {
-    my ($cmd, $output_filestem) = @_;
+    my ($cmd, $output_filestem) = @_;
 
     if ($ENV{'GSDLOS'} !~ m/^windows$/i) {
@@ -1102 +1108 @@
     $cmd .= " > \"$output_filestem.err\"";
     }
-    
+    print STDERR "gsConvert.pl: About to run cmd $cmd\n" if $verbosity >2;
     if (system($cmd)!=0)
     {
@@ -1178 +1184 @@
     #$cmd .= "pstotext -output \"$output_filestem.text\" $input_filename\"";
     $cmd .= " 2> $output_filestem.err";
+
+    print STDERR "gsConvert.pl: About to run cmd $cmd\n" if $verbosity >2;
     $!=0;
-
     my $retcode=system($cmd);
     $retcode = $? >> 8;  # see man perlfunc - system for this...