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

Timestamp:

2012-01-16T17:47:14+13:00 (12 years ago)

Author:

ak19

Message:

All perlcode that accesses extrametakeys, extrametadata, extrametafile data structures has been moved into a new perl module called extrametautil.pm. The next step will be to ensure that the file_regexes used to index into these data structures are consistent (using consistent slashes, like URL style slashes).

File:

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

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

@@ -29 +29 @@
 
 use BasePlugin;
+use extrametautil;
 
 use Encode;
@@ -325 +326 @@
 
     # Protect windows directory chars \
-    $file = &util::filename_to_regex($file);
+    $file = &util::filename_to_regex($file); #### 
     
     # Associate the metadata now
 
-    if (defined $extrametadata->{$file}) {
+    if (defined &extrametautil::getmetadata($extrametadata, $file)) {
     print STDERR "\n****  Need to merge new metadata with existing stored metadata: file = $file\n" if $verbosity > 2;
 
-    my $file_metadata_table =     $extrametadata->{$file};
+    my $file_metadata_table = &extrametautil::getmetadata($extrametadata, $file);
 
     foreach my $metaname (keys %exif_metadata) {
@@ -342 +343 @@
     }
     else {
-    $extrametadata->{$file} = \%exif_metadata;
-    push(@$extrametakeys, $file);
+    &extrametautil::setmetadata($extrametadata, $file, \%exif_metadata);
+    &extrametautil::addmetakey($extrametakeys, $file);
     }