Changeset 15004

Timestamp:

2008-02-22T11:32:38+13:00 (16 years ago)

Author:

davidb

Message:

In response to developing a custom plugin that stores metadata similar to MetadataXMLPlug, some functionality was shifted around so the custom plugin could also access it, and a couple of edits made so the two worked properly side by side.

Location:

gsdl/trunk/perllib

Files:

• metadatautil.pm (modified) (1 diff)
• plugins/MetadataXMLPlug.pm (modified) (4 diffs)

gsdl/trunk/perllib/metadatautil.pm

@@ -112 +112 @@
 }
 
+
+sub store_saved_metadata
+{
+    my ($plug,$mname,$mvalue,$md_accumulate) = @_;
+
+    if (defined $plug->{'saved_metadata'}->{$mname}) {
+    if ($md_accumulate) {
+        # accumulate mode - add value to existing value(s)
+        if (ref ($plug->{'saved_metadata'}->{$mname}) eq "ARRAY") {
+        push (@{$plug->{'saved_metadata'}->{$mname}}, $mvalue);
+        } else {
+        $plug->{'saved_metadata'}->{$mname} = 
+            [$plug->{'saved_metadata'}->{$mname}, $mvalue];
+        }
+    } else {
+        # override mode
+        $plug->{'saved_metadata'}->{$mname} = $mvalue;
+    }
+    } else {
+    if ($md_accumulate) {
+        # accumulate mode - add value into (currently empty) array
+        $plug->{'saved_metadata'}->{$mname} = [$mvalue];
+    } else {
+        # override mode
+        $plug->{'saved_metadata'}->{$mname} = $mvalue;
+    }
+    }
+}
+
+
 1;

gsdl/trunk/perllib/plugins/MetadataXMLPlug.pm

@@ -235 +235 @@
 
     if ($element eq "FileSet") {
-    push (@{$self->{'metakeysref'}}, @{$self->{'saved_targets'}});
     foreach my $target (@{$self->{'saved_targets'}}) {
         my $file_metadata = $self->{'metadataref'}->{$target};
@@ -241 +240 @@
         if (!defined $file_metadata) {
         $self->{'metadataref'}->{$target} = $saved_metadata;
+
+        # not had target before
+        push (@{$self->{'metakeysref'}}, $target);
         }
         else {
-        $self->combine_metadata_structures($file_metadata,$saved_metadata);
+        &metadatautil::combine_metadata_structures($file_metadata,$saved_metadata);
         }
     }
@@ -251 +253 @@
     }
     elsif ($element eq "Metadata") {
-    $self->store_saved_metadata($self->{'metadata_name'}, $self->{'metadata_value'}, $self->{'metadata_accumulate'});
+    &metadatautil::store_saved_metadata($self,$self->{'metadata_name'}, $self->{'metadata_value'}, $self->{'metadata_accumulate'});
     $self->{'metadata_name'} = "";
     }
@@ -280 +282 @@
 }
 
-sub combine_metadata_structures
-{
-    my $self = shift(@_);
-
-    my ($mdref1, $mdref2) = @_;
-    &metadatautil::combine_metadata_structures($mdref1, $mdref2);
-}
-
-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 combine_metadata_structures
+#{
+#    my $self = shift(@_);
+#
+#    my ($mdref1, $mdref2) = @_;
+#    &metadatautil::combine_metadata_structures($mdref1, $mdref2);
+#}