Changeset 9353

Timestamp:

2005-03-10T11:59:45+13:00 (19 years ago)

Author:

davidb

Message:

Combination of metadata passed on through the 'saved_metadata' mechanismn
in conflict with metadata.xml files. The metadata.xml files were wiping
out any metadata already stored in saved_metadata. Code revised to merge
two structures rather than assign over the top.

File:

• trunk/gsdl/perllib/plugins/RecPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -480 +480 @@
     push (@{$self->{'metakeysref'}}, @{$self->{'saved_targets'}});
     foreach my $target (@{$self->{'saved_targets'}}) {
-        $self->{'metadataref'}->{$target} = $self->{'saved_metadata'};
+        my $file_metadata = $self->{'metadataref'}->{$target};
+        my $saved_metadata = $self->{'saved_metadata'};
+        $self->combine_metadata_structures($file_metadata,$saved_metadata);
     }
     }
@@ -491 +493 @@
 
 }
+
+sub store_saved_metadata
+{
+    my $self = shift(@_);
+    my ($mname,$mvalue,$md_accumulate) = @_;
+
+    if (defined $self->{'saved_metadata'}->{$mname}) {
+    if ($md_accumulate) {
+        # accumulate mode - add value to existing value(s)
+        if (ref ($self->{'saved_metadata'}->{$mname}) eq "ARRAY") {
+        push (@{$self->{'saved_metadata'}->{$mname}}, $mvalue);
+        } else {
+        $self->{'saved_metadata'}->{$mname} = 
+            [$self->{'saved_metadata'}->{$mname}, $mvalue];
+        }
+    } else {
+        # override mode
+        $self->{'saved_metadata'}->{$mname} = $mvalue;
+    }
+    } else {
+    if ($md_accumulate) {
+        # accumulate mode - add value into (currently empty) array
+        $self->{'saved_metadata'}->{$mname} = [$mvalue];
+    } else {
+        # override mode
+        $self->{'saved_metadata'}->{$mname} = $mvalue;
+    }
+    }
+}
+
 
 sub Text {
@@ -501 +533 @@
     # $_ == Metadata content
     my $mname = $self->{'metadata_name'};
-    if (defined $self->{'saved_metadata'}->{$mname}) {
-        if ($self->{'metadata_accumulate'}) {
-        # accumulate mode - add value to existing value(s)
-        if (ref ($self->{'saved_metadata'}->{$mname}) eq "ARRAY") {
-            push (@{$self->{'saved_metadata'}->{$mname}}, $_);
-        } else {
-            $self->{'saved_metadata'}->{$mname} = 
-            [$self->{'saved_metadata'}->{$mname}, $_];
-        }
-        } else {
-        # override mode
-        $self->{'saved_metadata'}->{$mname} = $_;
-        }
-    } else {
-        if ($self->{'metadata_accumulate'}) {
-        # accumulate mode - add value into (currently empty) array
-        $self->{'saved_metadata'}->{$mname} = [$_];
-        } else {
-        # override mode
-        $self->{'saved_metadata'}->{$mname} = $_;
-        }
-    }
+    my $mvalue = $_;
+    my $md_accumulate = $self->{'metadata_accumulate'};
+    $self->store_saved_metadata($mname,$mvalue,$md_accumulate);
     }
 }