Changeset 10402

Timestamp:

2005-08-03T12:38:29+12:00 (19 years ago)

Author:

chi

Message:

Modifications to consider the different generated file names under windows and linux system. Also,
to convert the PDF documents to gif needs to be dealt with differently as the default conversion
converts the documents to GIF animation.

File:

• trunk/gsdl/bin/script/pdftoimg.pl (modified) (7 diffs)

trunk/gsdl/bin/script/pdftoimg.pl

@@ -60 +60 @@
     if (!parsargv::parse(\@ARGV,
              'convert_to/.*/^', \$convert_to,
-             ))
-    {
-    print_usage();
+             )) {
+        print_usage();
     }
     
@@ -86 +85 @@
     exit(1);
     }
-
-    # 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"
-        $self->{'imagemagick_not_installed'} = 1;
-        #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 1;
-    }
-    }
-    my $cmd = "convert";
-
     # 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.
-    $cmd = "convert" if ($ENV{'GSDLOS'} =~ /^windows$/);
-    $cmd .= " ".$input_filename." ".$output_filestem."/".$input_basename.".".$convert_to;
-    #$cmd .= " \"$input_filename\" -c quit > \"$output_filestem.text\"";
-
-    print STDERR "*** pdftoImge Command = $cmd\n";
-
+    $cmd = "convert";
+    #if ($ENV{'GSDLOS'} =~ /^windows$/);
+    #Convert utility will convert the PDF to GIF Animation
+    if ($convert_to eq "gif") {
+    if ($ENV{'GSDLOS'} =~ /^windows$/){
+        $cmd .= " ".$input_filename." ".$output_filestem."\\".$input_basename."-%02d.".$convert_to;
+    } else {
+        $cmd .= " ".$input_filename." ".$output_filestem."/".$input_basename."-%02d.".$convert_to;
+    }
+    } else {
+    if ($ENV{'GSDLOS'} =~ /^windows$/){
+        $cmd .= " ".$input_filename." ".$output_filestem."\\".$input_basename.".".$convert_to;
+    } else {
+        $cmd .= " ".$input_filename." ".$output_filestem."/".$input_basename.".".$convert_to;
+    }
+    }   
+ 
     # system() returns -1 if it can't run, otherwise it's $cmds ret val.
     # note we return 0 if the file is "encrypted"
@@ -119 +116 @@
     } else {
     # command execute successfully
-    create_itemfile($output_filestem, $input_basename);
+    create_itemfile($output_filestem, $input_basename, $convert_to);
     }
     return 0;
@@ -126 +123 @@
 sub create_itemfile
 {
-    my ($output_dir, $convert_basename) = @_;
+    my ($output_dir, $convert_basename, $convert_to) = @_;
     opendir(DIR, $output_dir) || die "can't opendir $output_dir: $!";  
     my $item_file = $output_dir."/".$convert_basename.".item";
@@ -139 +136 @@
     sub page_num {
     my ($dir) = @_;
-    my ($page_num) =($dir =~ m/^.*-(\d+)\.(.*)$/i);
-    return $page_num;
+    my $pagenum = "";
+    if ($ENV{'GSDLOS'} =~ /^windows$/){
+       ($pagenum) =($dir =~ m/^.*\.(\d+)$/i);   
+    } else {
+       ($pagenum) =($dir =~ m/^.*-(\d+)\.(.*)$/i);
+    }
+    $pagenum = $pagenum || 1;
+    return $pagenum;
     }
 
@@ -147 +150 @@
 
     foreach my $file (@dir_files){
-    $file =~ m/^.*-(\d+)\.(.*)$/i;
-
+        if ($ENV{'GSDLOS'} =~ /^windows$/ && $convert_to ne "gif"){
+      ($page_num) =($file =~ m/^.*\.(\d+)$/i); 
+    } else {
+        ($page_num) =($file =~ m/^.*-(\d+)\.(.*)/i);   
+    }
     # as the converter will convert the document to image files start from page 0
-    $page_num = $1+1;
+    $page_num =$page_num + 1 if defined $page_num;
     $page_num = 1 unless defined $page_num;
-    
     if ($file !~ /\.item/i){
         print FILE "   <Page pagenum=\"$page_num\" imgfile=\"$file\" txtfile=\"\"/>\n";
     } 
     }
+
     print FILE "</PagedDocument>\n";
     closedir DIR;
@@ -165 +171 @@
 exit (&main(@ARGV));
 
+
+