Changeset 13551

Timestamp:

2007-01-10T14:16:43+13:00 (17 years ago)

Author:

mdewsnip

Message:

Added a new option: sort_using_unicode_collation, which uses the Unicode::Collate module to sort Unicode values better (eg. e with acute is sorted with the other e values, not after everything else).

File:

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

trunk/gsdl/perllib/classify/GenericList.pm

@@ -68 +68 @@
     'type' => "metadata",
     'deft' => "Title" },
+      { 'name' => "sort_using_unicode_collation",
+    'desc' => "{GenericList.sort_using_unicode_collation}",
+    'type' => "flag" },
       { 'name' => "use_hlist_for",
     'desc' => "{GenericList.use_hlist_for}",
@@ -160 +163 @@
     }
     $self->{'sort_leaf_nodes_using_metadata_groups'} = \@sort_leaf_nodes_using_metadata_groups;
+
+    # Create an instance of the Unicode::Collate object if better Unicode sorting is desired
+    if ($self->{'sort_using_unicode_collation'}) {
+    require Unicode::Collate;
+    $self->{'unicode_collator'} = Unicode::Collate->new();
+    }
 
     # An empty array for the document OIDs
@@ -309 +318 @@
     if ($partition_type_within_level =~ /^per_letter$/i) {
     # Generate one hlist for each letter
-    my @sortedmetavalues = sort(keys %metavaluetoOIDhash);
+    my @sortedmetavalues = &sort_metadata_values_array($self, keys(%metavaluetoOIDhash));
     my %metavaluetoOIDsubhash = ();
 
@@ -337 +346 @@
     my $partition_size_within_level = $self->{$metadata_group . ".partition_size_within_level"};
     if ($partition_type_within_level =~ /^constant_size$/i && scalar(keys %metavaluetoOIDhash) > $partition_size_within_level) {
-        my @sortedmetavalues = sort(keys %metavaluetoOIDhash);
+        my @sortedmetavalues = &sort_metadata_values_array($self, keys(%metavaluetoOIDhash));
         my $itemsdone = 0;
         my %metavaluetoOIDsubhash = ();
@@ -471 +480 @@
 
     # Create an entry in the vlist for each value
-    foreach my $metavalue (sort(keys %metavaluetoOIDhash)) {
+    foreach my $metavalue (&sort_metadata_values_array($self, keys(%metavaluetoOIDhash))) {
     my @OIDs = @{$metavaluetoOIDhash{$metavalue}};
 
@@ -526 +535 @@
 
 
+sub sort_metadata_values_array
+{
+    my $self = shift(@_);
+    my @metadata_values = @_;
+
+    if ($self->{'unicode_collator'}) {
+    return $self->{'unicode_collator'}->sort(@metadata_values);
+    }
+    else {
+    return sort(@metadata_values);
+    }
+}
+
+
 1;