Changeset 24951 for main/trunk/greenstone2/perllib/plugins/LOMPlugin.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/LOMPlugin.pm (modified) (2 diffs)

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

@@ -32 +32 @@
 package LOMPlugin;
 
+use extrametautil;
 use ReadTextFile;
 use MetadataPass;
@@ -168 +169 @@
     $self->{'lom_srcdoc'} = undef; # reset for next file to be processed
 
-    push(@$extrametakeys,$file_re);
-    $extrametadata->{$file_re} = $self->{'saved_metadata'};
+    &extrametautil::addmetakey($extrametakeys, $file_re);
+    &extrametautil::setmetadata($extrametadata, $file_re, $self->{'saved_metadata'});
     if (defined $lom_srcdoc) {
     # copied from oaiplugin
-    if (!defined $extrametafile->{$file_re}) {
-        $extrametafile->{$file_re} = {};
+    if (!defined &extrametautil::getmetafile($extrametafile, $file_re)) {
+        &extrametautil::setmetafile($extrametafile, $file_re, {});
     }
      #maps the file to full path
-    $extrametafile->{$file_re}->{$file} = $filename_full_path;
+    &extrametautil::setmetafile_for_named_file($extrametafile, $file_re, $file, $filename_full_path);
     }