Changeset 38741 for main

Timestamp:

2024-02-13T17:14:35+13:00 (3 months ago)

Author:

davidb

Message:

Splicing in of $self->post_process_doc_obj() so new mapping_metadata_file rule-table works

File:

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

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

@@ -129 +129 @@
     my $arglist = $input_args->{$plugin_class};
 
+# The following turns out not to be needed, as the primary plugin will actually
+# get called to apply the metadata_mapping_file if set in its plugin options
+# via post_process_doc_obj()
+#   if ($self->{'metadata_mapping_file'}) {
+#       # If this plugin option has been set in the primary plugin, then
+#       # we always want to pass this on to the secondary plugin
+#       my $metadata_mapping_file = $self->{'metadata_mapping_file'};
+#       push(@$arglist, "-metadata_mapping_file", $metadata_mapping_file);
+#   }
+    
     my ($secondary_plugin);
     eval("\$secondary_plugin = new $plugin_class([],\$arglist)");
@@ -469 +479 @@
     $self->add_OID($doc_obj, 1);
 
+    $self->post_process_doc_obj($pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli);    
     return (1, $doc_obj);