Changeset 20828

Timestamp:

2009-10-21T15:06:47+13:00 (14 years ago)

Author:

kjdon

Message:

fixed a bug where when compacting, if the last bucket was retained as a bucket, then got an empty classification cos weren't testing whether the remaining oids were empty or not

File:

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

gsdl/trunk/perllib/classify/DateList.pm

@@ -110 +110 @@
     $self->{'metadata'} = $self->strip_ex_from_metadata($self->{'metadata'});
     $self->{'sort'} = $self->strip_ex_from_metadata($self->{'sort'});
-
+ 
     # now can have comma separated list of Dates - we just use the first one (for now)
     my @meta_list = split(/,/, $self->{"metadata"});
@@ -375 +375 @@
         $currentlastdate = $subsection;
     } else {
-
         if ($currentfirstdate eq $currentlastdate) {
         @{$compactedhash->{$currentfirstdate}} = @currentOIDs;
@@ -398 +397 @@
     # add final OIDs to last sub-classification if there aren't many otherwise
     # add final sub-classification
-    if ((scalar (@currentOIDs) < $min) && (scalar (@currentOIDs) > 0)) {
-    # want every thing in previous up to the dash
-    my ($newkey) = $lastkey =~ /^([^\-]+)/;
-    @currentOIDs = (@{$compactedhash->{$lastkey}}, @currentOIDs);
-    delete $compactedhash->{$lastkey};
-    @{$compactedhash->{"$newkey-$currentlastdate"}} = @currentOIDs; 
-    } else {
-    if ($currentfirstdate eq $currentlastdate) {
-        @{$compactedhash->{$currentfirstdate}} = @currentOIDs;
+    if (scalar (@currentOIDs) > 0) {
+    if ((scalar (@currentOIDs) < $min)) {
+        
+        # want every thing in previous up to the dash
+        my ($newkey) = $lastkey =~ /^([^\-]+)/;
+        @currentOIDs = (@{$compactedhash->{$lastkey}}, @currentOIDs);
+        delete $compactedhash->{$lastkey};
+        @{$compactedhash->{"$newkey-$currentlastdate"}} = @currentOIDs; 
     } else {
-        @{$compactedhash->{"$currentfirstdate-$currentlastdate"}} = @currentOIDs;
-    } 
-    }
-
+        if ($currentfirstdate eq $currentlastdate) {
+        @{$compactedhash->{$currentfirstdate}} = @currentOIDs;
+        } else {
+        @{$compactedhash->{"$currentfirstdate-$currentlastdate"}} = @currentOIDs;
+        } 
+    }
+    }
+    
     return $compactedhash;
 }