Changeset 22700 for gs2-extensions


Ignore:
Timestamp:
2010-08-21T00:31:09+12:00 (14 years ago)
Author:
davidb
Message:

Minor adjustments to make PDFBoxConverter fit in with new AutoloadConverterScripting Plugin

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gs2-extensions/pdf-box/trunk/perllib/plugins/PDFBoxConverter.pm

    r22669 r22700  
    6969
    7070        my $status = system($cmd);
     71
    7172        if ($status != 0) {
    7273        print STDERR "Testing for java\n";
     
    9192sub new {
    9293    my ($class) = shift (@_);
    93     my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
     94    my ($pluginlist,$inputargs,$hashArgOptLists,$auxilary) = @_;
    9495    push(@$pluginlist, $class);
    9596
     
    9798    push(@{$hashArgOptLists->{"OptList"}},$options);
    9899
    99     my $self = new BaseMediaConverter($pluginlist, $inputargs, $hashArgOptLists);
     100
     101    my $self = new BaseMediaConverter($pluginlist, $inputargs,
     102                      $hashArgOptLists, $auxilary);
    100103
    101104    if ($self->{'info_only'}) {
     
    163166
    164167    # Generate and run the convert command
    165     my $convert_cmd = $self->{'launch_cmd'};
     168    my $convert_cmd = $self->{'pdfbox_launch_cmd'};
    166169    $convert_cmd .= " -html" if ($target_file_type eq "html");
    167     my $convert_command .= " \"$source_file_full_path\" \"$target_file_path\"";
    168 
    169     print STDERR "**** convert_command = $convert_command\n";
     170    $convert_cmd .= " \"$source_file_full_path\" \"$target_file_path\"";
     171
     172    # print STDERR "**** convert_command = $convert_cmd\n";
    170173
    171174    my $print_info = { 'message_prefix' => "PDFBox Conversion",
     
    174177
    175178    my ($regenerated,$result,$had_error)
    176     = $self->autorun_general_cmd($convert_command,$source_file_full_path, $target_file_path,$print_info);
     179    = $self->autorun_general_cmd($convert_cmd,$source_file_full_path, $target_file_path,$print_info);
    177180    if ($had_error) {
    178181    return (0, $result,$target_file_path);
Note: See TracChangeset for help on using the changeset viewer.