Changeset 10357

Timestamp:

2005-07-29T14:37:55+12:00 (19 years ago)

Author:

chi

Message:

Adding the pdf_to_img routine in convertPDF() function.

File:

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

trunk/gsdl/bin/script/gsConvert.pl

@@ -137 +137 @@
     my $stored_dir = cwd();
     chdir ($dirname) || die "Unable to change to directory $dirname";
+
     # Select convert utility
     if (!defined $input_type) {
@@ -293 +294 @@
 
     my $success = 0;
+    $output_type =~ s/.*\-(.*)/$1/i;
+    # Attempt coversion to Image
+    if ($output_type =~ /jp?g|gif|png/i) {
+    $success = &pdf_to_img($dirname, $input_filename, $output_filestem, $output_type);
+    if ($success){
+        return "item";
+    }
+    }
 
     # Attempt conversion to HTML
@@ -335 +344 @@
 sub convertPPT {
     my ($input_filename, $output_filestem, $output_type) = @_;
-
     my $success = 0;
+
     my $ppt_convert_type = "";
     if (!$output_type || $windows_scripting ||($output_type !~ /html/i)){
@@ -351 +360 @@
             
     $cmd = "";
-    #if ($timeout) {$cmd = "ulimit -t $timeout;";}
-    #$cmd .= "$vbScript \"$input_filename\" \"$output_filestem.html\"";
-    #$cmd .= "$vbScript $input_filename $output_filestem.html";
+    if ($timeout) {$cmd = "ulimit -t $timeout;";}
     # if the converting directory has already existed
     if (-d $output_filestem) {
@@ -377 +384 @@
     $cmd .= " 2>\"$output_filestem.err\""
         if ($ENV{'GSDLOS'} !~ /^windows$/i || $is_winnt_2000);
-    
+
     # execute the command
     $!=0;
@@ -500 +507 @@
     $cmd .= " 2> \"$output_filestem.err\""
     if ($ENV{'GSDLOS'} !~ /^windows$/i || $is_winnt_2000);
-    
     # execute the command
     $!=0;
@@ -557 +563 @@
 }
 
+
 # Attempt to convert a word document to html with the word2html scripting program
 sub native_doc_to_html {
@@ -628 +635 @@
     return 0;
 }
-
-
 
 # Attempt to convert an RTF document to html with rtftohtml
@@ -805 +810 @@
     return 0;
     }
-    
+
+    &util::rm("$output_filestem.err") if (-e "$output_filestem.err");
+    &util::rm("$output_filestem.out") if (-e "$output_filestem.out");
+    return 1;
+}
+
+# Convert a pdf file to various types of image with the convert command
+
+sub pdf_to_img {
+    my ($dirname, $input_filename, $output_filestem, $output_type) = @_;
+  
+    $cmd = "";
+    if ($timeout) {$cmd = "ulimit -t $timeout;";}
+    $output_type =~ s/.*\_(.*)/$1/i;
+     $cmd .= "perl -S pdftoimg.pl -convert_to $output_type $input_filename $output_filestem";
+    if ($ENV{'GSDLOS'} !~ /^windows$/i || $is_winnt_2000) {
+    $cmd .= " > \"$output_filestem.out\" 2> \"$output_filestem.err\"";
+    } else {
+    $cmd .= " > \"$output_filestem.err\"";
+    }
+
+    #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";
+    if ($!) {print STDERR ": $!";} 
+    print STDERR "\n";
+    }
+
+    #make sure the converter made something
+    #if ($retval!=0 || ! -s "$output_filestem.html")
+    #if ($retval !=0) || ! -s "$output_filestem")
+    if ($retval !=0) 
+    {
+    &util::rm("$output_filestem.out") if (-e "$output_filestem.out");
+    #print out the converter's std err, if any
+    if (-s "$output_filestem.err") {
+        open (ERRLOG, "$output_filestem.err") || die "$!";
+        print STDERR "pdftohtml error log:\n";
+        while (<ERRLOG>) {
+        print STDERR "$_";
+        }
+        close ERRLOG;
+    }
+    &util::rm("$output_filestem.html") if (-e "$output_filestem.html");
+    if (-e "$output_filestem.err") {
+        if ($faillogfile ne "" && defined(open(FAILLOG,">>$faillogfile")))
+        {
+        open (ERRLOG, "$output_filestem.err");
+        while (<ERRLOG>) {print FAILLOG $_;}
+        close ERRLOG;
+        close FAILLOG;
+       }    
+        &util::rm("$output_filestem.err");
+    }
+    return 0;
+    }
     &util::rm("$output_filestem.err") if (-e "$output_filestem.err");
     &util::rm("$output_filestem.out") if (-e "$output_filestem.out");
@@ -897 +965 @@
     $cmd .= "gs -q -dNODISPLAY -dNOBIND -dWRITESYSTEMDICT -dSIMPLE -c save ";
     $cmd .= "-f ps2ascii.ps \"$input_filename\" -c quit > \"$output_filestem.text\"";
+    #$cmd .= "pstotext -output \"$output_filestem.text\" $input_filename\"";
     $cmd .= " 2> $output_filestem.err";
     $!=0;
+
     my $retcode=system($cmd);
     $retcode = $? >> 8;  # see man perlfunc - system for this...