Changeset 36470


Ignore:
Timestamp:
2022-08-24T11:58:42+12:00 (6 weeks 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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/EmbeddedMetadataPlugin.pm

    r36373 r36470  
    301301{
    302302    my $self = shift(@_);
    303     my ($file, $filename, $extrametadata, $extrametakeys) = @_;
     303    my ($file, $filename, $extrametadata, $extrametakeys, $extrametafile) = @_;
    304304 
    305305    my %exif_metadata = ();
     
    439439    $file = &util::raw_filename_to_unicode(&util::filename_head($filename), $file);
    440440
    441     $self->store_meta_in_extrametadata($file, $exif_metadata, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
     441    $self->store_meta_in_extrametadata($file, \%exif_metadata, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
    442442
    443443
     
    475475   
    476476    $self->extractEmbeddedMetadata($filename_no_path,$filename_full_path,
    477                    $extrametadata,$extrametakeys);
     477                   $extrametadata,$extrametakeys,$extrametafile);
    478478   
    479479    # also want it considered by other plugins in the metadata_read() pipeline
  • main/trunk/greenstone2/perllib/plugins/LOMPlugin.pm

    r36373 r36470  
    138138
    139139    $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
    140    
     140
    141141    print $outhandle "LOMPlugin: extracting metadata from $file\n"
    142142    if $self->{'verbosity'} > 1;
     
    171171   
    172172    if (defined $lom_srcdoc) {
    173     $self->store_meta_in_extrametadata($filename_re, $self->{'saved_metadata'}, $file, $filename_full_path, $extrametakeys, $extrametadata, $extrametafile);
     173    $self->store_meta_in_extrametadata($file_re, $self->{'saved_metadata'}, $file, $filename_full_path, $extrametakeys, $extrametadata, $extrametafile);
    174174    } else {
    175     $self->store_meta_in_extrametadata($filename_for_metadata, $self->{'saved_metadata'}, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
     175    $self->store_meta_in_extrametadata($file_re, $self->{'saved_metadata'}, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
    176176    }
    177177    $self->{'lom_srcdoc'} = undef; # reset for next file to be processed
Note: See TracChangeset for help on using the changeset viewer.