Changeset 20008 for gsdl/trunk/perllib/classify/List.pm

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).

File:

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

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"};