Changeset 32305 for main/trunk/greenstone2/perllib/plugins/PDFv2Plugin.pm

Timestamp:

2018-07-27T18:31:59+12:00 (6 years ago)

Author:

ak19

Message:

1. When a plugin's built on multiple inheritance, the first n-1 internal plugins before merging must allow extra args so that parsing does not fail: need to pass 1 (for true) to the constructors of the first n-1 internal plugins to allow extra args. Correcting both the recent PDFv2Plugin, where Renate had found a bug and Kathy had pointed out this fix, and the earlier UnknownConverterPlugin where I didn't know to add this parameter either. 2. Dr Bainbridge explained why UnknownConverterPlugin's convert_to option need not be manually defined when it was unexpectedly undefined: it being undefined only caused warnings when running pluginfo, and the actual solution was to return sooner from the constructor when in info_only (pluginfo) mode.

File:

• main/trunk/greenstone2/perllib/plugins/PDFv2Plugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/PDFv2Plugin.pm

@@ -31 +31 @@
 no strict 'subs'; # allow filehandles to be variables and viceversa
 
+use ConvertBinaryFile;
+use PDFBoxConverter;
 use ReadTextFile;
+
 use unicode;
 use Mojo::DOM; # for HTML parsing
 
-use PDFBoxConverter;
-use ConvertBinaryFile;
 
 @PDFv2Plugin::ISA = ('ConvertBinaryFile', 'PDFBoxConverter', 'ReadTextFile');
@@ -124 +125 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    my $pdfbox_converter_self = new PDFBoxConverter($pluginlist, $inputargs, $hashArgOptLists);
+    # the 1 at the end of the first constructor call is to allow extra arguments to remain after
+    # parsing. There should be no extra args after the final constructor call, because all args
+    # should have been parsed by then, so don't pass 1 to the last constructor.
+    my $pdfbox_converter_self = new PDFBoxConverter($pluginlist, $inputargs, $hashArgOptLists, 1);
     my $cbf_self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
     my $self = BaseImporter::merge_inheritance($pdfbox_converter_self, $cbf_self); # this param order seems necessary to preserve the default/user-selected value for the convert_to option