Changeset 6961

Timestamp:

2004-03-08T13:47:02+13:00 (20 years ago)

Author:

kjdon

Message:

removed some commented out stuff, changed the -metadata option to accept a comma separated list of metadata names - now uses the first one available, and list is sorted by this element

File:

• trunk/gsdl/perllib/classify/AZList.pm (modified) (5 diffs)

trunk/gsdl/perllib/classify/AZList.pm

@@ -36 +36 @@
 }
 
-use strict;
 
 my $arguments =
@@ -66 +65 @@
         'args'     => $arguments };
 
-#  sub print_usage {
-#      print STDERR "
-#    usage: classify AZList [options]
-#    options:
- 
-#    -metadata X           (required) Metadata field used for classification.
-#                          List will be sorted by this element.
-
-#    -buttonname X         (optional) Button name for this classification.
-#                          defaults to metadata name. 
-
-#    -removeprefix regex   (optional) A prefix to ignore in the Metadata values
-#                          for the field when sorting.
-#  ";
-#  }
 
 sub new {
@@ -86 +70 @@
     my $self = new BasClas($class, @_);
     
-    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
     my $option_list = $self->{'option_list'};
     push( @{$option_list}, $options );
     
-    my ($metaname, $title, $removeprefix, $removesuffix);
+    my ($metadata, $title, $removeprefix, $removesuffix);
     
     if (!parsargv::parse(\@_, 
-             q^metadata/.*/^, \$metaname,
+             q^metadata/.*/^, \$metadata,
              q^buttonname/.*/^, \$title,
              q^removeprefix/.*/^, \$removeprefix,
@@ -101 +84 @@
     print STDERR "\nIncorrect options passed to $class, check your collect.cfg file\n";
     $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
-
-    if (!defined $metaname) {
+    die "incorrect options \n";
+    }
+
+    if (!$metadata) {
+    print STDERR "AZList: -metadata option REQUIRED \n";
     $self->print_txt_usage("");  # Use default resource bundle
-    print STDERR "AZList used with no metadata name\n";
-    die "\n";
-    }
-    
-    $title = $metaname unless ($title);
+    
+    die "AZList: -metadata option REQUIRED\n";
+    }
+    
+    my @meta_list = split(/,/, $metadata);
+    my $meta1 = $meta_list[0];
+
+    $title = $meta1 unless ($title);
     
     $self->{'list'} = {};
-    $self->{'metaname'} = $metaname;
+    $self->{'meta_list'} = \@meta_list;
     $self->{'title'} = $title;
+    
     if (defined($removeprefix) && $removeprefix) {
     $removeprefix =~ s/^\^//; # don't need a leading ^
@@ -138 +126 @@
 
     my $doc_OID = $doc_obj->get_OID();
-    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
-    # sorting by we won't include it in this classification
-    if (defined $metavalue && $metavalue ne "") {
-    if (defined($self->{'removeprefix'}) &&
-        length($self->{'removeprefix'})) {
-        $metavalue =~ s/^$self->{'removeprefix'}//;
-    }
-    if (defined($self->{'removesuffix'}) &&
-        length($self->{'removesuffix'})) {
-        $metavalue =~ s/$self->{'removesuffix'}$//;
-    }
-
-    if ($self->{'metaname'} eq 'Language') {
-        $metavalue = $iso639::fromiso639{$metavalue};
-    } elsif ($self->{'metaname'} eq 'Creator') {
-        &sorttools::format_string_name_english (\$metavalue);
-    } else {
-        &sorttools::format_string_english (\$metavalue);
-    }
-    if (defined $self->{'list'}->{$doc_OID}) {
-        my $outhandle = $self->{'outhandle'};
-        print $outhandle "WARNING: AZList::classify called multiple times for $doc_OID\n";
-    } 
-    if ($metavalue) {
-        $self->{'list'}->{$doc_OID} = $metavalue;
-    } else {
-        my $outhandle = $self->{'outhandle'};
-        print $outhandle "WARNING: AZList: $doc_OID metadata is empty - not classifying\n";
-    }
-    }
+    my $outhandle = $self->{'outhandle'};
+
+    my $metavalue;
+    my $metaname;
+    # should we extend this to use all available metadata not just the first?
+    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($doc_obj->get_top_section(), $m);
+    $metaname = $m;
+    last if defined $metavalue;
+    } 
+    
+    #if we haven't found a metavalue here, then the doc shouldn't be included
+    if (!defined $metavalue || $metavalue eq "") {
+    print $outhandle "WARNING: AZList: $doc_OID metadata is empty - not classifying\n";
+    return;
+    }
+
+    if (defined($self->{'removeprefix'}) &&
+    length($self->{'removeprefix'})) {
+    $metavalue =~ s/^$self->{'removeprefix'}//;
+    }
+    if (defined($self->{'removesuffix'}) &&
+    length($self->{'removesuffix'})) {
+    $metavalue =~ s/$self->{'removesuffix'}$//;
+    }
+    
+    $metavalue = $self->format_metadata_for_sorting($metaname, $metavalue, $doc_obj);
+    
+    if (defined $self->{'list'}->{$doc_OID}) {
+    print $outhandle "WARNING: AZList::classify called multiple times for $doc_OID\n";
+    } 
+    if ($metavalue) {
+    $self->{'list'}->{$doc_OID} = $metavalue;
+    } else {
+    # the formatting has made it empty
+    my $outhandle = $self->{'outhandle'};
+    print $outhandle "WARNING: AZList: $doc_OID metadata has become empty - not classifying\n";
+    }
+    
 }