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

Timestamp:

2017-04-03T14:21:18+12:00 (7 years ago)

Author:

kjdon

Message:

added in alpha_numeric_sort - copied from AZlist I think, so if metadata values are numeric, then they will be sorted numerically, ie 10 comes after 9.

File:

• main/trunk/greenstone2/perllib/classify/List.pm (modified) (2 diffs)

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

@@ -684 +684 @@
             }
         }       
-        } 
+        }
         else {
         # The easier case, just add a partition
@@ -968 +968 @@
     }
     else {
-    return sort(@metadata_values);
-    }
-}
+    return sort { $self->alpha_numeric_cmp($a,$b) }(@metadata_values);
+    }
+}
+
+
+sub alpha_numeric_cmp
+{
+    my ($self,$a,$b) = @_;
+
+    if ($a =~ m/^(\d+(\.\d+)?)/)
+    {
+        my $val_a = $1;
+        if ($b =~ m/^(\d+(\.\d+)?)/)
+        {
+            my $val_b = $1;
+            if ($val_a != $val_b)
+            {
+                return ($val_a <=> $val_b);
+            }
+        }
+    }
+    
+    return ($a cmp $b);
+}
+
 
 sub get_metadata_value_display {