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

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

@@ -93 +93 @@
 
 use BasePlugin;
+use extrametautil;
 use util;
 use metadatautil;
@@ -327 +328 @@
     if ($element eq "FileSet") {
     foreach my $target (@{$self->{'saved_targets'}}) {
-        my $file_metadata = $self->{'metadataref'}->{$target};
+        my $file_metadata = &extrametautil::getmetadata($self->{'metadataref'}, $target);
         my $saved_metadata = $self->{'saved_metadata'};
 
         if (!defined $file_metadata) {
-        $self->{'metadataref'}->{$target} = $saved_metadata;
+        &extrametautil::setmetadata($self->{'metadataref'}, $target, $saved_metadata);
 
         # not had target before
-        push (@{$self->{'metakeysref'}}, $target);
+        &extrametautil::addmetakey($self->{'metakeysref'}, $target);
         }
         else {
@@ -346 +347 @@
         my $filename = $self->{'metadata-filename'};
 
-        if (!defined $self->{'metafileref'}->{$target}) {
-            $self->{'metafileref'}->{$target} = {};
+        if (!defined &extrametautil::getmetafile($self->{'metafileref'}, $target)) {
+            &extrametautil::setmetafile($self->{'metafileref'}, $target, {});
         }
 
-        $self->{'metafileref'}->{$target}->{$file} = $filename
+        &extrametautil::setmetafile_for_named_file($self->{'metafileref'}, $target, $file, $filename);
     }
     }