Changeset 6111

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.

Location:

trunk/gsdl/perllib

Files:

• classify/AZCompactList.pm (modified) (1 diff)
• classify/AZList.pm (modified) (2 diffs)
• classify/AZSectionList.pm (modified) (1 diff)
• classify/BasClas.pm (modified) (3 diffs)
• doc.pm (modified) (4 diffs)
• strings.rb (modified) (3 diffs)

trunk/gsdl/perllib/classify/AZCompactList.pm

@@ -58 +58 @@
 my $arguments = 
     [ { 'name' => "metadata",
-    'desc' => "{AZCompactList.metadata}",
+    'desc' => "{List.metadata}",
     'type' => "metadata",
     'reqd' => "yes" },

trunk/gsdl/perllib/classify/AZList.pm

@@ -38 +38 @@
 my $arguments =
     [ { 'name' => "metadata",
-    'desc' => "{AZList.metadata}",
+    'desc' => "{List.metadata}",
     'type' => "metadata",
     'reqd' => "yes" } ,
@@ -135 +135 @@
 
     my $doc_OID = $doc_obj->get_OID();
-    my $metavalue = $doc_obj->get_metadata_element ($doc_obj->get_top_section(),
-                            $self->{'metaname'});
+    my $metavalue = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), $self->{'metaname'}, $self->{'ignore_namespace'});
 
     # if this document doesn't contain the metadata element we're

trunk/gsdl/perllib/classify/AZSectionList.pm

@@ -47 +47 @@
 my $arguments = 
     [ { 'name' => "metadata",
-    'desc' => "{AZList.metadata}",
+    'desc' => "{List.metadata}",
     'type' => "metadata",
     'reqd' => "yes" },

trunk/gsdl/perllib/classify/BasClas.pm

@@ -51 +51 @@
 
 # 09/05/02 Added usage datastructure - John Thompson
+# 28/11/03 Commented out verbosity argument - John Thompson
 
 use parsargv;
@@ -66 +67 @@
     'type' => "string",
     'deft' => "STDERR" },
-      { 'name' => "verbosity",
-    'desc' => "{BasClas.verbosity}",
-    'type' => "enum",
-    'deft' => "2",
-    'reqd' => "no" } ];
+#      { 'name' => "verbosity",
+#   'desc' => "{BasClas.verbosity}",
+#   'type' => "enum",
+#   'deft' => "2",
+#   'reqd' => "no" } ];
+      { 'name' => "ignore_namespace",
+    'desc' => "{BasClas.ignore_namespace}",
+    'type' => "flag"} ];
 
 my $options = { 'name'     => "BasClas",
@@ -236 +240 @@
              q^outhandle/.*/STDERR^, \$self->{'outhandle'},
              q^verbosity/\d/2^, \$self->{'verbosity'},
+             q^ignore_namespace^, \$self->{'ignore_namespace'},
              "allow_extra_options")) {
 

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);
     }
         

trunk/gsdl/perllib/strings.rb

@@ -267 +267 @@
 AZCompactList.freqsort:Sort by node frequency rather than alpha-numeric.
 
-AZCompactList.metadata:Metadata field used for classification. List will be sorted by this element.
 AZCompactList.metadata.deft:Metadata element specified with -metadata.
 AZCompactList.maxcompact:Maximum number of documents to be displayed per page.
@@ -287 +286 @@
 AZList.desc:Classifier plugin for sorting alphabetically
 
-AZList.metadata:Metadata field used for classification. List will be sorted by this element.
-
 AZList.removeprefix:A prefix to ignore in the Metadata values for the field when sorting.
 
@@ -339 +336 @@
 List.desc:Simple list classifier plugin.
 
-List.metadata:Metadata field used for classification. List will be sorted by this element.
+List.metadata:A single Metadata field or a comma separated list of Metadata fields used for classification. Following the order indicated by the list, the first field that contains a Metadata value will be used. List will be sorted by this element.
 
 List.sort:Metadata field to sort by. If not set, sorts in build (random) order.