Changeset 20825

Timestamp:

2009-10-19T15:25:35+13:00 (15 years ago)

Author:

kjdon

Message:

check that the values of the partition_types_within_level option are valid

File:

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

gsdl/trunk/perllib/classify/List.pm

@@ -53 +53 @@
       { 'name' => "none",
     'desc' => "{List.level_partition.none}" } ];
+
+# following used to check types later on
+my $valid_partition_types = { 'per_letter' => 1,
+                  'constant_size' => 1,
+                  'per_letter_fixed_size' => 1,
+                  'none' => 1};
 
 my $bookshelf_type_list = 
@@ -166 +172 @@
     } else {
     my @partition_type_within_levellist = split(/\//, $self->{'partition_type_within_level'});  
+        
+    my $first = 1;
     foreach my $metadata_group (@metadata_groups) {
         my $partition_type_within_levelelem = shift(@partition_type_within_levellist);
-        if (defined($partition_type_within_levelelem)) {
+        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;
         }
         else {
-        $self->{$metadata_group . ".partition_type_within_level"} = $self->{$metadata_groups[0] . ".partition_type_within_level"};
-        }
-    }
-    }
-
+        if ($first) {
+            $self->{$metadata_group . ".partition_type_within_level"} = "none";
+            $first = 0;
+        } else {
+            $self->{$metadata_group . ".partition_type_within_level"} = $self->{$metadata_groups[0] . ".partition_type_within_level"};
+        }
+        if (defined($partition_type_within_levelelem)) {
+            # ie invalid entry
+            print STDERR "invalid partition type for level $metadata_group: $partition_type_within_levelelem, defaulting to ". $self->{$metadata_group . ".partition_type_within_level"} ."\n";
+        }
+        }
+    }
+    }
+    
     # The number of items in each partition
     if (!$self->{'partition_size_within_level'}) {
@@ -812 +829 @@
     
     # Sort leaf nodes and add to list
-    my @sort_leaf_nodes_usingmetadata_groups = @{$self->{'sort_leaf_nodes_using_metadata_groups'}};
-    foreach my $sort_leaf_nodes_usingmetaelem (reverse @sort_leaf_nodes_usingmetadata_groups) {
+    my @sort_leaf_nodes_using_metadata_groups = @{$self->{'sort_leaf_nodes_using_metadata_groups'}};
+    foreach my $sort_leaf_nodes_usingmetaelem (reverse @sort_leaf_nodes_using_metadata_groups) {
     my $OID_to_metadata_values_hash_ref = $self->{$sort_leaf_nodes_usingmetaelem . ".list"};
     # Force a stable sort (Perl 5.6's sort isn't stable)