Changeset 36470 for main/trunk

Timestamp:

2022-08-24T11:58:42+12:00 (20 months ago)

Author:

davidb

Message:

Tweaks after refactoring. Causes 'use strict' to report error as using variables that don't exist. Changes looked over by Kathy/David, yet to be tested however

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• EmbeddedMetadataPlugin.pm (modified) (3 diffs)
• LOMPlugin.pm (modified) (2 diffs)

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

@@ -301 +301 @@
 {
     my $self = shift(@_);
-    my ($file, $filename, $extrametadata, $extrametakeys) = @_;
+    my ($file, $filename, $extrametadata, $extrametakeys, $extrametafile) = @_;
  
     my %exif_metadata = ();
@@ -439 +439 @@
     $file = &util::raw_filename_to_unicode(&util::filename_head($filename), $file);
 
-    $self->store_meta_in_extrametadata($file, $exif_metadata, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
+    $self->store_meta_in_extrametadata($file, \%exif_metadata, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
 
 
@@ -475 +475 @@
     
     $self->extractEmbeddedMetadata($filename_no_path,$filename_full_path,
-                   $extrametadata,$extrametakeys);
+                   $extrametadata,$extrametakeys,$extrametafile);
     
     # also want it considered by other plugins in the metadata_read() pipeline

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

@@ -138 +138 @@
 
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
-    
+
     print $outhandle "LOMPlugin: extracting metadata from $file\n"
     if $self->{'verbosity'} > 1;
@@ -171 +171 @@
     
     if (defined $lom_srcdoc) {
-    $self->store_meta_in_extrametadata($filename_re, $self->{'saved_metadata'}, $file, $filename_full_path, $extrametakeys, $extrametadata, $extrametafile);
+    $self->store_meta_in_extrametadata($file_re, $self->{'saved_metadata'}, $file, $filename_full_path, $extrametakeys, $extrametadata, $extrametafile);
     } else {
-    $self->store_meta_in_extrametadata($filename_for_metadata, $self->{'saved_metadata'}, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
+    $self->store_meta_in_extrametadata($file_re, $self->{'saved_metadata'}, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
     }
     $self->{'lom_srcdoc'} = undef; # reset for next file to be processed