Changeset 13272

Timestamp:

2006-11-15T13:30:40+13:00 (17 years ago)

Author:

mdewsnip

Message:

Changed a couple of variable names to be more accurate.

File:

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

trunk/gsdl/perllib/classify/GenericList.pm

@@ -280 +280 @@
     # print STDERR "Number of OID values: " . @OIDs . "\n";
 
-    my %OIDtometavaluehash = %{$self->{$metadata_group . ".list"}};
+    my %OIDtometavalueshash = %{$self->{$metadata_group . ".list"}};
 
     # Create a mapping from metadata value to OID
     my %metavaluetoOIDhash = ();
     foreach my $OID (@OIDs) {
-    if ($OIDtometavaluehash{$OID}) {
-        my @metavalues = @{$OIDtometavaluehash{$OID}};
+    if ($OIDtometavalueshash{$OID}) {
+        my @metavalues = @{$OIDtometavalueshash{$OID}};
         foreach my $metavalue (@metavalues) {
         push(@{$metavaluetoOIDhash{$metavalue}}, $OID);
@@ -453 +453 @@
         # Find the offset of this metadata value
         my $offset = 0;
-        my %OIDtometavaluehash = %{$self->{$metadata_group . ".list"}};
-        my @metavalues = @{$OIDtometavaluehash{$OID}};
+        my %OIDtometavalueshash = %{$self->{$metadata_group . ".list"}};
+        my @metavalues = @{$OIDtometavalueshash{$OID}};
         for (my $i = 0; $i < scalar(@metavalues); $i++) {
         if ($metavalue eq $metavalues[$i]) {
@@ -481 +481 @@
         my @sort_leaf_nodes_usingmetadata_groups = @{$self->{'sort_leaf_nodes_using_metadata_groups'}};
         foreach my $sort_leaf_nodes_usingmetaelem (reverse @sort_leaf_nodes_usingmetadata_groups) {
-            my %OIDtometavaluehash = %{$self->{$sort_leaf_nodes_usingmetaelem . ".list"}};
+            my %OIDtometavalueshash = %{$self->{$sort_leaf_nodes_usingmetaelem . ".list"}};
             # Force a stable sort (Perl 5.6's sort isn't stable)
             # !! The [0] bits aren't ideal (multiple metadata values) !! 
-            @OIDs = @OIDs[ sort { $OIDtometavaluehash{$OIDs[$a]}[0] cmp $OIDtometavaluehash{$OIDs[$b]}[0] || $a <=> $b; } 0..$#OIDs ];
+            @OIDs = @OIDs[ sort { $OIDtometavalueshash{$OIDs[$a]}[0] cmp $OIDtometavalueshash{$OIDs[$b]}[0] || $a <=> $b; } 0..$#OIDs ];
         }