Changeset 11433

Timestamp:

2006-03-21T10:48:46+12:00 (18 years ago)

Author:

shaoqun

Message:

modified splitlist method to handle reverse_sort parameter

File:

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

trunk/gsdl/perllib/classify/DateList.pm

@@ -145 +145 @@
     print $outhandle "WARNING: DateList::classify called multiple times for $doc_OID\n";
     } 
-
+   
+     
     $self->{'list'}->{$doc_OID} = "$date$sort_other";
-    
+
 }
 
@@ -155 +156 @@
 
     my @classlist = sort {$self->{'list'}->{$a} cmp $self->{'list'}->{$b};} keys %{$self->{'list'}};
+
     if ($self->{'reverse_sort'}) {
     @classlist = reverse @classlist;
     }
+
 
     return $self->splitlist (\@classlist);
@@ -190 +193 @@
     if (scalar (@$classlistref) <= 39 &&
     !$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)
@@ -228 +232 @@
         # 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);
+        
+        if ($self->{'reverse_sort'}){
+               foreach my $subclass (sort {$b <=> $a} 
+                    (keys %$classhash)){
+          my $yearclassify = $self->get_entry($subclass, "HList");
+          foreach my $subsubclass (sort {$b <=> $a} 
+                       (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 my $subsubOID 
+              (@{$classhash->{$subclass}->{$subsubclass}}) {
+                  push (@{$monthclassify->{'contains'}},
+                  {'OID'=>$subsubOID});
+              }
+          }
+          push (@{$classifyinfo->{'contains'}}, $yearclassify);
+          }
+        }
+        else{
+        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 my $subsubOID 
+              (@{$classhash->{$subclass}->{$subsubclass}}) {
+                  push (@{$monthclassify->{'contains'}},
+                    {'OID'=>$subsubOID});
+              }
+          }
+            push (@{$classifyinfo->{'contains'}}, $yearclassify);
+        }
         
-            foreach my $subsubOID 
-            (@{$classhash->{$subclass}->{$subsubclass}}) {
-                push (@{$monthclassify->{'contains'}},
-                  {'OID'=>$subsubOID});
-            }
-        }
-        push (@{$classifyinfo->{'contains'}}, $yearclassify);
-        }
+        
+        }
+        
         return $classifyinfo;
     } # nogroup
-    } else {
+    }else {
     # not by month
     # first split up the list into separate year classifications
@@ -264 +299 @@
         push (@{$classhash->{$date}}, $classification);
     }
+          
     }
     
@@ -270 +306 @@
     $classhash = $self->compactlist ($classhash);
     }
-    foreach my $subclass (sort keys %$classhash) {
-    my $tempclassify = $self->get_entry($subclass, "DateList");
-    foreach my $subsubOID (@{$classhash->{$subclass}}) {
-        push (@{$tempclassify->{'contains'}}, {'OID'=>$subsubOID});
-    }
-    push (@{$classifyinfo->{'contains'}}, $tempclassify);
-    }
-
+
+    if ($self->{'reverse_sort'} && $self->{'nogroup'} ) {
+    foreach my $subclass (reverse sort keys %$classhash) {
+        my $tempclassify = $self->get_entry($subclass, "DateList");
+        foreach my $subsubOID (@{$classhash->{$subclass}}) {
+        push (@{$tempclassify->{'contains'}}, {'OID'=>$subsubOID});
+        }
+        push (@{$classifyinfo->{'contains'}}, $tempclassify);
+    }
+    }
+    else{
+    foreach my $subclass (sort keys %$classhash) {
+        my $tempclassify = $self->get_entry($subclass, "DateList");
+        foreach my $subsubOID (@{$classhash->{$subclass}}) {
+        push (@{$tempclassify->{'contains'}}, {'OID'=>$subsubOID});
+        }
+        push (@{$classifyinfo->{'contains'}}, $tempclassify);
+    }
+
+    }
+    
+  
     return $classifyinfo;
 }