Changeset 10979 for trunk/gsdl

Timestamp:

2005-12-09T10:52:21+13:00 (18 years ago)

Author:

kjdon

Message:

DateList can now take a comma separated list of metadata names.

Location:

trunk/gsdl/perllib

Files:

• classify/DateList.pm (modified) (3 diffs)
• strings.rb (modified) (1 diff)

trunk/gsdl/perllib/classify/DateList.pm

@@ -102 +102 @@
     $self->{'metadata'} = "Date";
     }
-    
+    # now can have comma separated list of Dates - we just use the first one (for now)
+    my @meta_list = split(/,/, $self->{"metadata"});
+    $self->{'meta_list'} = \@meta_list;
+ 
     return bless $self, $class;
 }
@@ -117 +120 @@
 
     my $doc_OID = $doc_obj->get_OID();
-    my $date = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), $self->{'metadata'});
+
+    # find the first available metadata
+    my $date;
+    foreach my $m (@{$self->{'meta_list'}}) {
+    $date = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $m);
+    last if defined $date;
+    } 
+    
+    #my $date = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), $self->{'metadata'});
+    if (!defined $date || $date eq "") {
+    # if this document doesn't contain Date element we won't 
+    # include it in this classification
+    return;
+    }
     
     my $sort_other = "";
@@ -124 +140 @@
     $sort_other = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sort_other, $doc_obj) unless $self->{'no_metadata_formatting'};
     }
-    # if this document doesn't contain Date element we won't 
-    # include it in this classification
-    if (defined $date && $date =~ /\d/) {
-    if (defined $self->{'list'}->{$doc_OID}) {
-        my $outhandle = $self->{'outhandle'};
-        print $outhandle "WARNING: DateList::classify called multiple times for $doc_OID\n";
-    } 
-
-    $self->{'list'}->{$doc_OID} = "$date$sort_other";
-    }
+    
+    if (defined $self->{'list'}->{$doc_OID}) {
+    my $outhandle = $self->{'outhandle'};
+    print $outhandle "WARNING: DateList::classify called multiple times for $doc_OID\n";
+    } 
+
+    $self->{'list'}->{$doc_OID} = "$date$sort_other";
+    
 }
 

trunk/gsdl/perllib/strings.rb

@@ -428 +428 @@
 DateList.desc:Classifier plugin for sorting by date. By default, sorts by 'Date' metadata. Date is assumed to be in the form yyyymmdd.
 
-DateList.metadata:The metadata that contains the dates to classify by. The format is expected to be yyyymmdd.
+DateList.metadata:The metadata that contains the dates to classify by. The format is expected to be yyyymmdd. Can be a comma separated list, in which case the first date found will be used.
 
 DateList.reverse_sort:Sort the documents in reverse chronological order (newest first).