Changeset 2632

Timestamp:

2001-07-09T19:14:52+12:00 (23 years ago)

Author:

jrm21

Message:

added an option "-bymonth=1", to group by (eg) 2000-January, 2000-February etc.
It actually uses the _textmonth_ macros, so the month is in the correct
language. This is only until Dana gets proper classification hierarchy stuff
going at run-time.

File:

• trunk/gsdl/perllib/classify/DateList.pm (modified) (8 diffs)

trunk/gsdl/perllib/classify/DateList.pm

@@ -26 +26 @@
 # classifier plugin for sorting by date
 
-# no options - always sorts by 'Date' metadata
+# always sorts by 'Date' metadata
 
 # date is assumed to be in the form yyyymmdd
 
 # at present dates are split by year - this should change
+# jrm21 - added option "bymonth", which splits by year and month.
 
 package DateList;
@@ -43 +44 @@
 sub print_usage {
     print STDERR "
-  usage: classify DateList
-
-Classifier plugin for sorting by date.
-No options - always sorts by 'Date' metadata
-Date is assumed to be in the form yyyymmdd
-At present dates are split by year - this should change
-
-Any errors are Dana's problem.
+  usage: classify DateList [options]
+  options:
+    -bymonth  [or bymonth=1]    Classify by year and month
+
+    Classifier plugin for sorting by date.
+    Always sorts by 'Date' metadata.
+    Date is assumed to be in the form yyyymmdd (all digits).
+    By default dates are split by year - this should change.
+
+    Any errors are Dana's problem.
 ";
 }
@@ -59 +62 @@
 
     $self->{'list'} = {};
-
+    if (!parsargv::parse(\@_, 
+                         q^bymonth^, \$self->{'bymonth'},
+                         "allow_extra_options")) {
+        &print_usage();
+        die "\n";
+    }
     return bless $self, $class;
 }
@@ -111 +119 @@
 }
 
-# splitlist takes an ordered list of classifications (@$classlistref) and splits it
-# up into sub-sections by date
+# splitlist takes an ordered list of classifications (@$classlistref) and
+# splits it up into sub-sections by date
 sub splitlist {
     my $self = shift (@_);
@@ -131 +139 @@
     }
 
-    # first split up the list into separate year classifications
-    foreach $classification (@$classlistref) {
-    my $date = $self->{'list'}->{$classification};
-    $date =~ s/^(\d\d\d\d).*$/$1/;
-    $classhash->{$date} = [] unless defined $classhash->{$date};
-    push (@{$classhash->{$date}}, $classification);
-    }
-
+
+    if ($self->{'bymonth'}) {
+    # first split up the list into separate year+month classifications
+    foreach $classification (@$classlistref) {
+        my $date = $self->{'list'}->{$classification};
+        $date =~ s/^(\d\d\d\d)(\d\d).*$/$1 _textmonth$2_/;
+        # sanity check if month is zero
+        if ($date =~ /00_$/) {
+        $date =~ s/^(\d\d\d\d).*$/$1/g;
+        }
+        $classhash->{$date} = [] unless defined $classhash->{$date};
+        push (@{$classhash->{$date}}, $classification);
+    }
+    } else {
+    # first split up the list into separate year classifications
+    foreach $classification (@$classlistref) {
+        my $date = $self->{'list'}->{$classification};
+        $date =~ s/^(\d\d\d\d).*$/$1/;
+        $classhash->{$date} = [] unless defined $classhash->{$date};
+        push (@{$classhash->{$date}}, $classification);
+    }
+    }
     $classhash = $self->compactlist ($classhash);
 
@@ -157 +179 @@
     my $compactedhash = {};
     my @currentOIDs = ();
-    my $currentfirstletter = "";
-    my $currentlastletter = "";
+    my $currentfirstdate = "";
+    my $currentlastdate = "";
     my $lastkey = "";
 
@@ -168 +190 @@
     my $min = 10; 
     my $max = 30;
-
-    foreach $subsection (sort keys %$classhashref) {
-    $currentfirstletter = $subsection if $currentfirstletter eq "";
+    foreach my $subsection (sort keys %$classhashref) {
+    $currentfirstdate = $subsection if $currentfirstdate eq "";
     if ((scalar (@currentOIDs) < $min) ||
         ((scalar (@currentOIDs) + scalar (@{$classhashref->{$subsection}})) <= $max)) {
         push (@currentOIDs, @{$classhashref->{$subsection}});
-        $currentlastletter = $subsection;
+        $currentlastdate = $subsection;
     } else {
 
-        if ($currentfirstletter eq $currentlastletter) {
-        @{$compactedhash->{$currentfirstletter}} = @currentOIDs;
-        $lastkey = $currentfirstletter;
+        if ($currentfirstdate eq $currentlastdate) {
+        @{$compactedhash->{$currentfirstdate}} = @currentOIDs;
+        $lastkey = $currentfirstdate;
         } else {
-        @{$compactedhash->{"$currentfirstletter-$currentlastletter"}} = @currentOIDs;
-        $lastkey = "$currentfirstletter-$currentlastletter";
+        @{$compactedhash->{"$currentfirstdate-$currentlastdate"}} = @currentOIDs;
+        $lastkey = "$currentfirstdate-$currentlastdate";
         } 
         if (scalar (@{$classhashref->{$subsection}}) >= $max) {
         $compactedhash->{$subsection} = $classhashref->{$subsection};
         @currentOIDs = ();
-        $currentfirstletter = "";
+        $currentfirstdate = "";
         $lastkey = $subsection;
         } else {
         @currentOIDs = @{$classhashref->{$subsection}};
-        $currentfirstletter = $subsection;
-        $currentlastletter = $subsection;
+        $currentfirstdate = $subsection;
+        $currentlastdate = $subsection;
         }
     }
@@ -203 +224 @@
     @currentOIDs = (@{$compactedhash->{$lastkey}}, @currentOIDs);
     delete $compactedhash->{$lastkey};
-    @{$compactedhash->{"$newkey-$currentlastletter"}} = @currentOIDs;   
+    @{$compactedhash->{"$newkey-$currentlastdate"}} = @currentOIDs; 
     } else {
-    if ($currentfirstletter eq $currentlastletter) {
-        @{$compactedhash->{$currentfirstletter}} = @currentOIDs;
+    if ($currentfirstdate eq $currentlastdate) {
+        @{$compactedhash->{$currentfirstdate}} = @currentOIDs;
     } else {
-        @{$compactedhash->{"$currentfirstletter-$currentlastletter"}} = @currentOIDs;
+        @{$compactedhash->{"$currentfirstdate-$currentlastdate"}} = @currentOIDs;
     } 
     }