Changeset 38748

Timestamp:

2024-02-14T22:56:15+13:00 (4 months ago)

Author:

davidb

Message:

Shifted position of when to apply metadata mapping rules to be earlier, so generated metadata can be used in assigned OID

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• BaseImporter.pm (modified) (2 diffs)
• ConvertBinaryFile.pm (modified) (1 diff)
• PagedImagePlugin.pm (modified) (1 diff)

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

@@ -793 +793 @@
     # this was shifted to here from inside read()
     $self->title_fallback($doc_obj,$section,$filename_no_path);
-    
+
+    if ($self->{'metadata_mapping_rules'}) {
+    $self->apply_metadata_mapping_file($doc_obj);
+    }
+
     $self->add_OID($doc_obj);
-    
+
     $self->post_process_doc_obj($pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli);
     return (1,$doc_obj);
@@ -914 +918 @@
     my $self = shift (@_);  
     my ($pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
-
-    if ($self->{'metadata_mapping_rules'}) {
-    $self->apply_metadata_mapping_file($doc_obj);
-    }
     
     return 1;

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

@@ -476 +476 @@
     $self->title_fallback($doc_obj,$topsection,$filename_no_path);
 
+    if ($self->{'metadata_mapping_rules'}) {
+    $self->apply_metadata_mapping_file($doc_obj);
+    }
+    
     # force a new OID - this will use OIDtype option set for this plugin.
     $self->add_OID($doc_obj, 1);

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

@@ -369 +369 @@
     $self->title_fallback($doc_obj,$section,$filename_no_path);
 
+    if ($self->{'metadata_mapping_rules'}) {
+    $self->apply_metadata_mapping_file($doc_obj);
+    }
+
+    # force a new OID - this will use OIDtype option set for this plugin.
     $self->add_OID($doc_obj);