Changeset 6806

Timestamp:

2004-02-16T17:22:58+13:00 (20 years ago)

Author:

jrm21

Message:

Bah. We were accidentally dropping the last classification because of a typo
(we were checking if @currentOIDS, when it should be currentOIDs).
Now we have "use strict;" to tell us when we use an undeclared variable!!

File:

• trunk/gsdl/perllib/classify/AZList.pm (modified) (10 diffs)

trunk/gsdl/perllib/classify/AZList.pm

@@ -35 +35 @@
     @ISA = ('BasClas');
 }
+
+use strict;
 
 my $arguments =
@@ -230 +232 @@
     # don't need to do any splitting if there are less than 39 (max + min -1) classifications
     if ((scalar @$classlistref) <= 39) {
-    foreach $subOID (@$classlistref) {
+    foreach my $subOID (@$classlistref) {
         push (@{$classifyinfo->{'contains'}}, {'OID'=>$subOID});
     }
@@ -237 +239 @@
     
     # first split up the list into separate A-Z and 0-9 classifications
-    foreach $classification (@$classlistref) {
+    foreach my $classification (@$classlistref) {
     my $title = $self->{'list'}->{$classification};
 
@@ -255 +257 @@
 
     my @tmparr = ();
-    foreach $subsection (sort keys (%$classhash)) {
+    foreach my $subsection (sort keys (%$classhash)) {
     push (@tmparr, $subsection);
     }
@@ -266 +268 @@
     }
 
-    foreach $subclass (@tmparr) {
+    foreach my $subclass (@tmparr) {
     my $tempclassify = $self->get_entry($subclass, "VList");
-    foreach $subsubOID (@{$classhash->{$subclass}}) {
+    foreach my $subsubOID (@{$classhash->{$subclass}}) {
         push (@{$tempclassify->{'contains'}}, {'OID'=>$subsubOID});
     }
@@ -282 +284 @@
     my $compactedhash = {};
     my @currentOIDs = ();
-    my $currentfirstletter = "";
-    my $currentlastletter = "";
-    my $lastkey = "";
+    my $currentfirstletter = "";  # start of working bin
+    my $currentlastletter = "";   # end of working bin
+    my $lastkey = "";             # the name of the last completed key
 
     # minimum and maximum documents to be displayed per page.
@@ -294 +296 @@
     my $max = 30;
 
-    foreach $subsection (sort keys %$classhashref) {
+    foreach my $subsection (sort keys %$classhashref) {
     if ($subsection eq '0-9') {
+        # leave this bin as-is... copy it straight across
         @{$compactedhash->{$subsection}} = @{$classhashref->{$subsection}};
         next;
@@ -302 +305 @@
     if ((scalar (@currentOIDs) < $min) ||
         ((scalar (@currentOIDs) + scalar (@{$classhashref->{$subsection}})) <= $max)) {
+        # add this letter to the bin and continue
         push (@currentOIDs, @{$classhashref->{$subsection}});
         $currentlastletter = $subsection;
     } else {
-
+        # too many or too few for a separate bin
         if ($currentfirstletter eq $currentlastletter) {
         @{$compactedhash->{$currentfirstletter}} = @currentOIDs;
@@ -314 +318 @@
         } 
         if (scalar (@{$classhashref->{$subsection}}) >= $max) {
+        # this key is now complete. Start a new one
         $compactedhash->{$subsection} = $classhashref->{$subsection};
         @currentOIDs = ();
@@ -329 +334 @@
     # add final sub-classification
     # BUG FIX: don't add anything if there are no currentOIDs (thanks to Don Gourley)
-    if (@currentOIDS) {
-    if (scalar (@currentOIDs) < $min) {
-        my ($newkey) = $lastkey =~ /^(.)/;
-        @currentOIDs = (@{$compactedhash->{$lastkey}}, @currentOIDs);
-        delete $compactedhash->{$lastkey};
-        @{$compactedhash->{"$newkey-$currentlastletter"}} = @currentOIDs;   
+    if (! scalar(@currentOIDs)) {return $compactedhash;}
+
+    if (scalar (@currentOIDs) < $min) {
+    my ($newkey) = $lastkey =~ /^(.)/;
+    @currentOIDs = (@{$compactedhash->{$lastkey}}, @currentOIDs);
+    delete $compactedhash->{$lastkey};
+    @{$compactedhash->{"$newkey-$currentlastletter"}} = @currentOIDs;
+    } else {
+    if ($currentfirstletter eq $currentlastletter) {
+        @{$compactedhash->{$currentfirstletter}} = @currentOIDs;
     }
     else {
-        if ($currentfirstletter eq $currentlastletter) {
-        @{$compactedhash->{$currentfirstletter}} = @currentOIDs;
-        }
-        else {
-        @{$compactedhash->{"$currentfirstletter-$currentlastletter"}} = @currentOIDs;
-        }
+        @{$compactedhash->{"$currentfirstletter-$currentlastletter"}} =
+        @currentOIDs;
     }
     }