Changeset 6111 for trunk/gsdl/perllib/doc.pm

Timestamp:

2003-12-03T12:02:55+13:00 (20 years ago)

Author:

jmt12

Message:

Changed the description for the -metadata flag to foreshadow the coming enhancement. This commit also happens to include the prototype -ignore_arguments flag to AZList, that will never actually be used because of the aforementioned metadata enhancement.

File:

• trunk/gsdl/perllib/doc.pm (modified) (4 diffs)

trunk/gsdl/perllib/doc.pm

@@ -608 +608 @@
 
 # returns the first metadata value which matches field
+
+# This version of get metadata element works much like the one above,
+# except it allows for the namespace portion of a metadata element to
+# be ignored, thus if you are searching for dc.Title, the first piece
+# of matching metadata ending with the name Title (once any namespace
+# is removed) would be returned.
+# 28-11-2003 John Thompson
 sub get_metadata_element {
     my $self = shift (@_);
-    my ($section, $field) = @_;
+    my ($section, $field, $ignore_namespace) = @_;
     my ($data);
+
+    $ignore_namespace = 0 unless defined $ignore_namespace;
 
     my $section_ptr = $self->_lookup_section($section);
@@ -620 +629 @@
     }
 
+    # Remove the any namespace if we are being told to ignore them
+    if($ignore_namespace) {
+    $field =~ s/^\w*\.//;
+    }
+
     foreach $data (@{$section_ptr->{'metadata'}}) {
-    return $data->[1] if (scalar(@$data) >= 2 && $data->[0] eq $field);
+
+    my $data_name = $data->[0];
+    # Remove the any namespace if we are being told to ignore them
+    if($ignore_namespace) {
+        $data_name =~ s/^\w*\.//;
+    }
+    
+    return $data->[1] if (scalar(@$data) >= 2 && $data_name eq $field);
     }
     
@@ -627 +648 @@
 }
 
-
 # returns a list of the form [value1, value2, ...]
 sub get_metadata {
     my $self = shift (@_);
-    my ($section, $field) = @_;
+    my ($section, $field, $ignore_namespace) = @_;
     my ($data);
+
+    $ignore_namespace = 0 unless defined $ignore_namespace;
 
     my $section_ptr = $self->_lookup_section($section);
@@ -641 +663 @@
     }
 
+    # Remove the any namespace if we are being told to ignore them
+    if($ignore_namespace) {
+    $field =~ s/^\w*\.//;
+    }
+
     my @metadata = ();
     foreach $data (@{$section_ptr->{'metadata'}}) {
-        push (@metadata, $data->[1]) if ($data->[0] eq $field);
+
+    my $data_name = $data->[0];
+    # Remove the any namespace if we are being told to ignore them
+    if($ignore_namespace) {
+        $data_name =~ s/^\w*\.//;
+    }
+
+        push (@metadata, $data->[1]) if ($data_name eq $field);
     }