Changeset 33460

Timestamp:

2019-09-09T13:04:34+12:00 (5 years ago)

Author:

kjdon

Message:

fixed up some typos. removed use_hlist_for option. This is very hard to understand and actually only works if partition_type is none, and bookshelf_type is always - puts the bookshelves into hlist instead of vlist. instead, I have added all_values partition type. This just makes each value become a partition. Might be useful for Dates, or other short classification id.

File:

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

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

@@ -80 +80 @@
     'desc' => "{List.level_partition.approximate_size}"}, 
       { 'name' => "constant_size",
-    'desc' => "{List.level_partition.constant_size}" },      
+    'desc' => "{List.level_partition.constant_size}" },  
+      { 'name' => "all_values",
+    'desc' => "{List.level_partition.all_values}" },
       { 'name' => "none",
     'desc' => "{List.level_partition.none}" } ];
@@ -89 +91 @@
                   'constant_size' => 1,
                   'approximate_size' => 1,
+                  'all_values' => 1,
                   'none' => 1};
 
@@ -99 +102 @@
     'desc' => "{List.level_partition.per_number}" },
       { 'name' => "single_partition",
-    'desc' => "{List.level_partition_single}" },
+    'desc' => "{List.level_partition.single}" },
       { 'name' => "approximate_size",
     'desc' => "{List.level_partition.approximate_size_numeric}"}, 
       { 'name' => "constant_size",
     'desc' => "{List.level_partition.constant_size}" },      
+      { 'name' => "all_values",
+    'desc' => "{List.level_partition.all_values}" },
       { 'name' => "none",
     'desc' => "{List.level_partition.none}" } ];
@@ -114 +119 @@
                       'single_partition' => 1,
                       'approximate_size' => 1,
+                      'all_values' => 1,
                                       'none' =>1  };
 
@@ -202 +208 @@
       
       { 'name' => "numbers_first",
-    'desc' => "{List.numbers_first",
+    'desc' => "{List.numbers_first}",
     'type' => 'flag'},
       
@@ -223 +229 @@
     'desc' => "{List.metadata_sort.unicode} {List.sort_using_unicode_collation}",
     'type' => "flag" },
-      
-      { 'name' => "use_hlist_for",
-    'desc' => "{List.use_hlist_for}",
-    'type' => "string" },
-      
+
       {'name' => "filter_metadata",
        'desc' => "{List.filter_metadata}",
@@ -698 +700 @@
     # Otherwise just add all the values to a VList
     else {
+        if ($partition_type_within_level =~ /^all_values$/i) {
+        $classifier_node->{'childtype'} = "HList";
+        $self->{$metadata_group. ".bookshelf_type"} = "always";
+        }
         $self->add_vlist(\@metadata_groups, $classifier_node, \%metadata_value_to_OIDs_hash);
     }
@@ -743 +749 @@
     # Otherwise just add all the values to a VList
     else {
+    if ($numeric_partition_type_within_level =~ /^all_values$/i) {
+        $classifier_node->{'childtype'} = "HList";
+        $self->{$metadata_group. ".bookshelf_type"} = "always";
+    }
+    
     $self->add_vlist(\@metadata_groups, $classifier_node, $numeric_metadata_value_to_OIDs_hash_ref);
     }