Changeset 20008

Timestamp:

2009-07-17T19:05:24+12:00 (15 years ago)

Author:

ak19

Message:

Adjusted the code to deal with 1. semicolons and commas separating metadata fieldnames, 2. Greenstone extracted metadata fieldnames being referred to with the ex. prefix, 3. List's partition_type_within_level option is to be an enumerated type (dropdown list).

Location:

gsdl/trunk/perllib

Files:

• classify/AZCompactList.pm (modified) (1 diff)
• classify/BaseClassifier.pm (modified) (1 diff)
• classify/List.pm (modified) (5 diffs)
• classify/SimpleList.pm (modified) (1 diff)
• strings.properties (modified) (2 diffs)

gsdl/trunk/perllib/classify/AZCompactList.pm

@@ -190 +190 @@
 
     $metaname =~ s/(\/|\|).*//; # grab first name in n1/n2/n3 or n1|n2|n3 list
-    my @commameta_list = split(/,/, $metaname);
+    my @commameta_list = split(/,|;/, $metaname);
 
     if ($self->{'doclevel'} =~ /^top(level)?/i)

gsdl/trunk/perllib/classify/BaseClassifier.pm

@@ -361 +361 @@
     return "" unless defined $metadata && $metadata =~ /\S/;
     
-    my @metalist = split(/,/, $metadata);
+    my @metalist = split(/,|;/, $metadata);
     my $firstmeta = $metalist[0];
     if ($firstmeta =~ /\./) {

gsdl/trunk/perllib/classify/List.pm

@@ -60 +60 @@
     'desc' => "{List.bookshelf_type.duplicate_only}" },
       { 'name' => "never",
-    'desc' => "{List.bookshelf_type.never}" } ];      
+    'desc' => "{List.bookshelf_type.never}" } ];  
 
 my $arguments = 
@@ -79 +79 @@
       { 'name' => "partition_type_within_level",
     'desc' => "{List.partition_type_within_level}",
-    'type' => "string",
-    'deft' => "none" },
+    'type' => "enum",
+    'list' => $partition_type_list,
+    'deft' => "per_letter" },
       { 'name' => "partition_size_within_level",
     'desc' => "{List.partition_size_within_level}",
@@ -139 +140 @@
     if (!$self->{'buttonname'}) {
     my $first_metadata_group = $metadata_groups[0];
-    my $first_metadata_element = (split(/\;/, $first_metadata_group))[0];
+    my $first_metadata_element = (split(/\;|,/, $first_metadata_group))[0];
     $self->{'buttonname'} = $self->generate_title_from_metadata($first_metadata_element);
     }
@@ -296 +297 @@
     my $classify_section = 0;
     my $first_metadata_group = $metadata_groups[0];
-    foreach my $first_metadata_group_element (split(/\;/, $first_metadata_group)) {
+    foreach my $first_metadata_group_element (split(/\;|,/, $first_metadata_group)) {
     my $first_metadata_group_element_value = $doc_obj->get_metadata_element($section, $first_metadata_group_element);   
     
@@ -334 +335 @@
     # Take care not to do a metadata group more than once
     unless ($metadata_groups_done{$metadata_group}) {
-        foreach my $metadata_element (split(/\;/, $metadata_group)) {       
+        foreach my $metadata_element (split(/\;|,/, $metadata_group)) {     
         my $remove_prefix_expr = $self->{$metadata_element . ".remove_prefix_expr"};
         my $remove_suffix_expr = $self->{$metadata_element . ".remove_suffix_expr"};

gsdl/trunk/perllib/classify/SimpleList.pm

@@ -75 +75 @@
     my (@meta_list,$meta1);
     if ($self->{"metadata"}) {
-    @meta_list = split(/,/, $self->{"metadata"});
+    @meta_list = split(/,|;/, $self->{"metadata"});
     $meta1 = $meta_list[0];
     $self->{'meta_list'} = \@meta_list;

gsdl/trunk/perllib/strings.properties

@@ -596 +596 @@
 List.desc:A general and flexible list classifier with most of the abilities of AZCompactList, but with better Unicode, metadata and sorting capabilities.
 
+List.level_partition.none:None.
 List.level_partition.per_letter:Create a partition for each letter.
 List.level_partition.constant_size:Create partition with constant size.
@@ -606 +607 @@
 List.partition_size_within_level:The number of items in each partition (only applies when partition_type_within_level is set to 'constant_size').
 
-List.partition_type_within_level:The type of partitioning done: either 'per_letter', 'constant_size', or 'none'.
+List.partition_type_within_level:The type of partitioning done: either 'per_letter', 'per_letter_fixed_size', 'constant_size', or 'none'.
 
 List.sort_leaf_nodes_using:Metadata fields used for sorting the leaf nodes. Use '|' to separate the metadata groups to stable sort and ';' to separate metadata fields within each group.