Changeset 33454

Timestamp:

2019-09-03T14:41:11+12:00 (5 years ago)

Author:

kjdon

Message:

updated metadata_selection_mode to be metadata_selection_mode_within_level - I had changed the param name, but not teh code to match. if either partition_type or numeric_partition_type is none, then set the other one for the same level to be none. Can't have half the values partitioned and not the other half

File:

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

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

@@ -137 +137 @@
       
       { 'name' => "metadata_selection_mode_within_level",
-    'desc' => "{List.metadata_selection_mode}",
+    'desc' => "{List.metadata_selection_mode_within_level}",
     'type' => "enumstring", # Must be enumstring because multiple values can be specified (separated by '/')
     'list' => $metadata_selection_mode_list,
@@ -143 +143 @@
       
       { 'name' => "metadata_sort_mode_within_level",
-    'desc' => "{List.metadata_sort_mode}",
+    'desc' => "{List.metadata_sort_mode_within_level}",
     'type' => "enumstring", # Must be enumstring because multiple values can be specified (separated by '/')
     'list' => $metadata_sort_mode_list,
@@ -289 +289 @@
 
     # meta selection mode for each level
-    $self->set_metadata_groups_info_per_level("metadata_selection_mode", $metadata_selection_mode_default, $valid_metadata_selection_modes);
+    $self->set_metadata_groups_info_per_level("metadata_selection_mode_within_level", $metadata_selection_mode_default, $valid_metadata_selection_modes);
    
     # meta sort mode for each level
@@ -328 +328 @@
     $self->set_metadata_groups_info_per_level("numeric_partition_type_within_level", $numeric_partition_type_default, $valid_numeric_partition_types);
 
+    # now check whether a level was none - need to set the equivalent level in the other half also to none
+    foreach my $metadata_group (@metadata_groups) {
+    if ($self->{$metadata_group . ".partition_type_within_level"} eq "none" || $self->{$metadata_group . ".numeric_partition_type_within_level"} eq "none") {
+        
+        print STDERR "WARNING: one of -partition_type_within_level or -numeric_partition_type_within_level was set to 'none' for level $metadata_group, overriding current value of both these options to 'none'\n";
+    
+        $self->{$metadata_group . ".partition_type_within_level"} = "none";
+        $self->{$metadata_group . ".numeric_partition_type_within_level"} = "none";
+    }
+    }
+    
     $self->set_metadata_groups_info_per_level("partition_size_within_level", $partition_size_default);
     $self->set_metadata_groups_info_per_level("numeric_partition_size_within_level", $numeric_partition_size_default);
@@ -379 +390 @@
     foreach my $sort_group (@sort_leaf_nodes_using_metadata_groups) {
     # set metadata_select_type, if not already set - might be already set if the same group was used in -metadata
-    if (!defined $self->{$sort_group . ".metadata_selection_mode"}) {
-        $self->{$sort_group . ".metadata_selection_mode"} = $metadata_selection_mode_default;
+    if (!defined $self->{$sort_group . ".metadata_selection_mode_within_level"}) {
+        $self->{$sort_group . ".metadata_selection_mode_within_level"} = $metadata_selection_mode_default;
     }
     
@@ -428 +439 @@
     my $info_default = shift(@_);
     my $info_valid_types_hash_ref = shift(@_);
-    
+
+    if (!defined $self->{$info_name}) {
+    print STDERR "**** undefined $info_name\n";
+    }
     my @info_list = split(/\//, $self->{$info_name});
 
@@ -582 +596 @@
                 }
             }
-            last if ($self->{$metadata_group . ".metadata_selection_mode"} eq "firstvalue");
+            last if ($self->{$metadata_group . ".metadata_selection_mode_within_level"} eq "firstvalue");
             }
         } # foreach metadatavalue
-        last if ((@metadata_values > 0) &&  $self->{$metadata_group . ".metadata_selection_mode"} =~ /^(firstvalue|firstvalidmetadata)$/ );
+        last if ((@metadata_values > 0) &&  $self->{$metadata_group . ".metadata_selection_mode_within_level"} =~ /^(firstvalue|firstvalidmetadata)$/ );
         } # foreach metadata element