Changeset 22667 for main/trunk/greenstone2/perllib/classify/List.pm

Timestamp:

2010-08-18T13:19:55+12:00 (14 years ago)

Author:

mdewsnip

Message:

Added code to prevent uninitialized value errors when trying to sort on metadata fields that don't exist in the collection.

File:

• main/trunk/greenstone2/perllib/classify/List.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/classify/List.pm

@@ -867 +867 @@
     # Force a stable sort (Perl 5.6's sort isn't stable)
     # !! The [0] bits aren't ideal (multiple metadata values) !! 
-    @OIDs = @OIDs[ sort { $OID_to_metadata_values_hash_ref->{$OIDs[$a]}[0] cmp $OID_to_metadata_values_hash_ref->{$OIDs[$b]}[0] || $a <=> $b; } 0..$#OIDs ];
+    @OIDs = @OIDs[ sort {
+      if (defined($OID_to_metadata_values_hash_ref->{$OIDs[$a]} && defined($OID_to_metadata_values_hash_ref->{$OIDs[$b]})))
+      {
+        $OID_to_metadata_values_hash_ref->{$OIDs[$a]}[0] cmp $OID_to_metadata_values_hash_ref->{$OIDs[$b]}[0];
+      }
+      else
+      {
+        $a <=> $b;
+      }
+    } 0..$#OIDs ];
     }
     return @OIDs;