Changeset 36373 for main/trunk/greenstone2/perllib/plugins/EmbeddedMetadataPlugin.pm

Timestamp:

2022-08-16T19:45:27+12:00 (21 months ago)

Author:

kjdon

Message:

now I have removed commented out code from last commit

File:

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

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

@@ -30 +30 @@
 use BaseImporter;
 use MetadataRead;
-use extrametautil;
 use util;
 
@@ -437 +436 @@
     }
 
-    # Indexing into the extrameta data structures requires the filename's style of slashes to be in URL format
-    # Then need to convert the filename to a regex, no longer to protect windows directory chars \, but for
-    # protecting special characters like brackets in the filepath such as "C:\Program Files (x86)\Greenstone".
-    #print STDERR "file = $file " . &unicode::debug_unicode_string($file);
+   #print STDERR "file = $file " . &unicode::debug_unicode_string($file);
     $file = &util::raw_filename_to_unicode(&util::filename_head($filename), $file);
 
     $self->store_meta_in_extrametadata($file, $exif_metadata, undef, undef, $extrametakeys, $extrametadata, $extrametafile);
 
-    if (0) {
-    #print STDERR "$file ". &unicode::debug_unicode_string($file);
-    $file = &util::filepath_to_url_format($file);
-    #print STDERR "$file " . &unicode::debug_unicode_string($file);
-    $file = &util::filename_to_regex($file); 
-    #print STDERR "$file ".&unicode::debug_unicode_string($file) ."\n";
-    
-    # Associate the metadata now
-
-    if (defined &extrametautil::getmetadata($extrametadata, $file)) {
-    print STDERR "\n****  EmbeddedMetadataPlugin: Need to merge new metadata with existing stored metadata: file = $file\n" if $verbosity > 3;
-
-    my $file_metadata_table = &extrametautil::getmetadata($extrametadata, $file);
-
-    foreach my $metaname (keys %exif_metadata) {
-        # will create new entry if one does not already exist
-        push(@{$file_metadata_table->{$metaname}}, @{$exif_metadata{$metaname}});       
-    }
-
-    # no need to push $file on to $extrametakeys as it is already in the list
-    }
-    else {
-    &extrametautil::setmetadata($extrametadata, $file, \%exif_metadata);
-    &extrametautil::addmetakey($extrametakeys, $file);
-    }
-    }
+
 }