Changeset 6969 for trunk

Timestamp:

2004-03-08T15:48:17+13:00 (20 years ago)

Author:

kjdon

Message:

removed the args, cos it only uses AZlist args anyway. now uses self->format_metadata_for_sorting, and uses comma separated list of metadata instead of just one

File:

• trunk/gsdl/perllib/classify/AZSectionList.pm (modified) (3 diffs)

trunk/gsdl/perllib/classify/AZSectionList.pm

@@ -45 +45 @@
 }
 
-my $arguments = 
-    [ { 'name' => "metadata",
-    'desc' => "{AZList.metadata}",
-    'type' => "metadata",
-    'reqd' => "yes" },
-      { 'name' => "buttonname",
-    'desc' => "{BasClas.buttonname}",
-    'type' => "string",
-    'deft' => "{BasClas.metadata.deft}",
-    'reqd' => "no" } ];
-
 my $options = { 'name'     => "AZSectionList",
         'desc'     => "{AZSectionList.desc}",
         'abstract' => "no",
-        'inherits' => "yes",
-        'args'     => $arguments };
+        'inherits' => "yes" }; 
 
 
@@ -97 +85 @@
 
     my $doc_OID = $doc_obj->get_OID();
-    my $metavalue = $doc_obj->get_metadata_element ($section, $self->{'metaname'});
+
+    my $metavalue;
+    my $metaname;
+
+    if (!defined $self->{'meta_list'}) {
+    # just in case
+    return;
+    }
+
+    # find the first available metadata
+    foreach $m (@{$self->{'meta_list'}}) {
+    $metavalue = $doc_obj->get_metadata_element($section, $m);
+    $metaname = $m;
+    last if defined $metavalue;
+    } 
 
     # if this section doesn't contain the metadata element we're
@@ -106 +108 @@
         $metavalue =~ s/^$self->{'removeprefix'}//;
     }
-    if ($self->{'metaname'} eq 'Creator') {
-        &sorttools::format_string_name_english (\$metavalue);
-    } else {
-        &sorttools::format_string_english (\$metavalue);
-    }
+    
+    $metavalue = $self->format_metadata_for_sorting($metaname, $metavalue, $doc_obj);
     if (defined $self->{'list'}->{"$doc_OID.$section"}) {
         my $outhandle = $self->{'outhandle'};