Changeset 10401

Timestamp:

2005-08-03T12:36:02+12:00 (19 years ago)

Author:

chi

Message:

Modifications to allow PDF documents being converted to various image files (e.g. gif, jpg, png)
through 'convert' utility, Then, PagedImgPlug could be used to demonstrate the documents. So now,
the user can set up the type of conversion in -convert_to option. For example,
-convert_to html: through pdftohtml.pl
-convert_to pagedimg_gif(jpg/png): through pdftoimg.pl

File:

• trunk/gsdl/bin/script/gsConvert.pl (modified) (5 diffs)

trunk/gsdl/bin/script/gsConvert.pl

@@ -215 +215 @@
     if (!$output_type || ($output_type =~ /html/i)){
     if ($windows_scripting) {
-        print STDERR "***** Calling VB Script!\n";
         $success = &native_doc_to_html($input_filename, $output_filestem);
     }
     else {
-        print STDERR "**** Calling wvWare\n";
         $success = &doc_to_html($input_filename, $output_filestem);    
     }
@@ -820 +818 @@
 sub pdf_to_img {
     my ($dirname, $input_filename, $output_filestem, $output_type) = @_;
-  
+
+    # Check that ImageMagick is installed and available on the path (except for Windows 95/98)
+    if (!($ENV{'GSDLOS'} eq "windows" && !Win32::IsWinNT())) {
+    my $result = `identify 2>&1`;
+    if ($? == -1 || $? == 256) {  # Linux and Windows return different values for "program not found"
+        #ImageMagick is not installed, thus the convert utility is not available. 
+        print STDERR "*** ImageMagick is not installed, the convert utility is not available\n";
+        return 0;
+    }
+    }
+
     $cmd = "";
     if ($timeout) {$cmd = "ulimit -t $timeout;";}
@@ -831 +839 @@
     }
 
-    #print STDERR "*** gsConvert pdf_to_img Command =$cmd\n";
-    
     # don't include path on windows (to avoid having to play about
     # with quoting when GSDLHOME might contain spaces) but assume
     # that the PATH is set up correctly
-    
     $!=0;
     my $retval=system($cmd);
     if ($retval!=0)
     {
-    print STDERR "Error executing pdftohtml.pl";
+    print STDERR "Error executing pdftoimg.pl";
     if ($!) {print STDERR ": $!";} 
     print STDERR "\n";
@@ -847 +852 @@
 
     #make sure the converter made something
-    #if ($retval!=0 || ! -s "$output_filestem.html")
     #if ($retval !=0) || ! -s "$output_filestem")
     if ($retval !=0) 
@@ -855 +859 @@
     if (-s "$output_filestem.err") {
         open (ERRLOG, "$output_filestem.err") || die "$!";
-        print STDERR "pdftohtml error log:\n";
+        print STDERR "pdftoimg error log:\n";
         while (<ERRLOG>) {
         print STDERR "$_";