Changeset 20865

Timestamp:

2009-10-30T10:55:28+13:00 (14 years ago)

Author:

kjdon

Message:

changed per_letter_fixed_size to approximate_size, allow the former for backwards compatibility, uppercase metadata before sorting, approximate_size now generates an hlist by default

File:

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

gsdl/trunk/perllib/classify/List.pm

@@ -47 +47 @@
     [ { 'name' => "per_letter",
     'desc' => "{List.level_partition.per_letter}" },
+      { 'name' => "approximate_size",
+    'desc' => "{List.level_partition.approximate_size}"}, 
       { 'name' => "constant_size",
     'desc' => "{List.level_partition.constant_size}" },      
-      { 'name' => "per_letter_fixed_size",
-    'desc' => "{List.level_partition.per_letter_fixed_size}"}, 
       { 'name' => "none",
     'desc' => "{List.level_partition.none}" } ];
@@ -58 +58 @@
                   'constant_size' => 1,
                   'per_letter_fixed_size' => 1,
+                  'approximate_size' => 1,
                   'none' => 1};
 
@@ -176 +177 @@
     foreach my $metadata_group (@metadata_groups) {
         my $partition_type_within_levelelem = shift(@partition_type_within_levellist);
+        if (defined($partition_type_within_levelelem) && $partition_type_within_levelelem eq "per_letter_fixed_size") {
+        print STDERR "per letter fixed size, changing to approximate size\n";
+        $partition_type_within_levelelem = "approximate_size";
+        }
         if (defined($partition_type_within_levelelem) && defined $valid_partition_types->{$partition_type_within_levelelem}) {
         $self->{$metadata_group . ".partition_type_within_level"} = $partition_type_within_levelelem;
@@ -376 +381 @@
             }
 
+            # uppercase the metadata - makes the AZList nicer
+            $metadata_value = uc($metadata_value);
             # Convert the metadata value from a UTF-8 string to a Unicode string
             # This means that length() and substr() work properly
@@ -477 +484 @@
     $classifier_node->{'childtype'} = "HList";
     }
-    elsif ($partition_type_within_level =~ /^per_letter_fixed_size$/i) {
+    elsif ($partition_type_within_level =~ /^approximate_size$/i) {
     # Generate hlist based on the first letter of the metadata value (like per_letter) but with restriction on the partition size
     # If a letter has fewer items than specified by the "partition_size_within_level", then group them together if possible
@@ -622 +629 @@
         }
     }   
-    }
+    
+    # The partitions are stored in an HList
+    $classifier_node->{'childtype'} = "HList";
+
+    } # end approximate_size
     else {
     # Generate hlists of a certain size