Changeset 6081

Timestamp:

2003-12-02T15:05:23+13:00 (20 years ago)

Author:

jrm21

Message:

rename "nogroupyear" option to "nogroup" as it can now be used with the
"bymonth" option... bymonth by itself will group year+month entries in the
hlist, and combined will create an hlist of years then a separate hlist of
months.

File:

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

trunk/gsdl/perllib/classify/DateList.pm

@@ -37 +37 @@
 # 23/09/03 Added some more options -kjdon.
 # these include:
-# -nogroupyears, which makes each year an individual entry in 
+# -nogroup, which makes each year (or year+month) an individual entry in 
 # the horizontal list and prevents compaction
 # -datemeta, use a different metadata for the date (instead of Date), still expects yyyymmdd format. this affects display cos greenstone displays Date metadata as dd month yyyy, whereas any other date metadata is displayed as yyyymmdd - this needs fixing
@@ -57 +57 @@
     'reqd' => "no" },
 
-      { 'name' => "nogroupyears",
-    'desc' => "{DateList.nogroupyears}",
+      { 'name' => "nogroup",
+    'desc' => "{DateList.nogroup}",
     'type' => "flag",
     'reqd' => "no" },
@@ -90 +90 @@
 
     my ($datemeta, $sortmeta);
-    $self->{'nogroupyears'}=0;
+    $self->{'nogroup'}=0;
     if (!parsargv::parse(\@_, 
                          q^bymonth^, \$self->{'bymonth'},
-             q^nogroupyears^, \$self->{'nogroupyears'},
+             q^nogroup^, \$self->{'nogroup'},
              q^datemeta/.*/^, \$datemeta,
              q^sortmeta/.*/^, \$sortmeta,
@@ -177 +177 @@
 
     if (scalar (@$classlistref) <= 39 &&
-    !$self->{'nogroupyears'}) {$childtype = "DateList";}
+    !$self->{'nogroup'}) {$childtype = "DateList";}
     my $classifyinfo = $self->get_entry ("Date", $childtype, "Invisible");
 
     # don't need to do any splitting if there are less than 39 (max + min -1)
-    # classifications, unless nogroupyears is specified
-    if ((scalar @$classlistref) <= 39 && !$self->{'nogroupyears'}) {
+    # classifications, unless nogroup is specified
+    if ((scalar @$classlistref) <= 39 && !$self->{'nogroup'}) {
     foreach $subOID (@$classlistref) {
         push (@{$classifyinfo->{'contains'}}, {'OID'=>$subOID});
@@ -192 +192 @@
     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&nbsp;_textmonth$2_/;
-        # sanity check if month is zero
-        if ($date =~ /00_$/) {
-        $date =~ s/^(\d\d\d\d).*$/$1/g;
+
+    if (!$self->{'nogroup'}) { # hlist of year+month pairs
+        # single level of classifications
+        foreach $classification (@$classlistref) {
+        my $date = $self->{'list'}->{$classification};
+        $date =~ s/^(\d\d\d\d)(\d\d).*$/$1&nbsp;_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);
         }
-        $classhash->{$date} = [] unless defined $classhash->{$date};
-        push (@{$classhash->{$date}}, $classification);
-    }
+        
+    } else { # don't group - individual years and months
+        foreach $classification (@$classlistref) {
+        my $date = $self->{'list'}->{$classification};
+        $date =~ s/^(\d\d\d\d)(\d\d).*$/$1&nbsp;_textmonth$2_/;
+        my ($year, $month)=($1,$2);
+        # sanity check if month is zero
+        if ($date =~ /00_$/) {
+            $date =~ s/^(\d\d\d\d).*$/$1/g;
+        }
+        # create subclass if it doesn't already exist
+        $classhash->{$year} = () unless defined $classhash->{$year};
+        $classhash->{$year}->{$month} = []
+            unless defined $classhash->{$year}->{$month};
+        push (@{$classhash->{$year}->{$month}}, $classification);
+        }
+        # create hlist of years containing hlists of months
+
+        foreach my $subclass (sort {$a <=> $b} keys %$classhash) {
+        my $yearclassify = $self->get_entry($subclass, "HList");
+        foreach my $subsubclass (sort {$a <=> $b} 
+                     (keys %{$classhash->{$subclass}})) {
+            my $monthname=$subsubclass;
+            if ($monthname >= 1 && $monthname <= 12) {
+            $monthname="_textmonth" . $monthname . "_";
+            }
+            my $monthclassify=$self->get_entry($monthname, "DateList");
+            push (@{$yearclassify->{'contains'}}, $monthclassify);
+        
+            foreach $subsubOID 
+            (@{$classhash->{$subclass}->{$subsubclass}}) {
+                push (@{$monthclassify->{'contains'}},
+                  {'OID'=>$subsubOID});
+            }
+        }
+        push (@{$classifyinfo->{'contains'}}, $yearclassify);
+        }
+        # not sure if this is needed... AZCompactList has it :p
+        $classifyinfo->{'mdtype'}=$self->{'datemeta'};
+        return $classifyinfo;
+    } # nogroup
     } else {
+    # not by month
     # first split up the list into separate year classifications
     foreach $classification (@$classlistref) {
@@ -211 +256 @@
     }
     }
-
-    # only compact the list if nogroupyears not specified
-    if (!$self->{'nogroupyears'}) {
+    
+    # only compact the list if nogroup not specified
+    if (!$self->{'nogroup'}) {
     $classhash = $self->compactlist ($classhash);
     }