Changeset 27098 for main/trunk

Timestamp:

2013-03-19T15:27:51+13:00 (11 years ago)

Author:

kjdon

Message:

new option for List: standardize_capitalization. If set, then bookshelf names will be lowercase. If not set, the majority case variant will be used instead

Location:

main/trunk/greenstone2/perllib

Files:

• classify/List.pm (modified) (4 diffs)
• strings.properties (modified) (1 diff)

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

@@ -114 +114 @@
        'desc' => "{List.filter_regex}",
        'type' => "regexp"},
-      
+      { 'name' => "standardize_capitalization",
+    'desc' => "{List.standardize_capitalization}",
+    'type' => "flag"},
       { 'name' => "removeprefix",
     'desc' => "{BasClas.removeprefix}",
@@ -404 +406 @@
             # text-transform the stored lowercase values as capitalize or uppercase (can't CSS 
             # text-transform if stored uppercase). 2 CSS text-transforms have been added to core.css
-            $metadata_value = lc($metadata_value);
+            my $lc_metadata_value = lc($metadata_value);
             
             # We are already working with unicode aware strings at this 
             # stage, so we no longer need to convert from utf8 to unicode 
-            my $metadata_value_unicode_string = $metadata_value; # $self->convert_utf8_string_to_unicode_string($metadata_value);
+            #my $metadata_value_unicode_string = $metadata_value; # $self->convert_utf8_string_to_unicode_string($metadata_value);
 
             # Add the metadata value into the list for this combination of metadata group and section
-            push(@{$self->{$metadata_group . ".list"}->{$section_OID}}, $metadata_value_unicode_string);
+            push(@{$self->{$metadata_group . ".list"}->{$section_OID}}, $lc_metadata_value);
+            # add the actual value into the stored values so we can remember the case
+            if (!$self->{'standardize_capitalization'}) {
+            if (defined $self->{$metadata_group . ".actualvalues"}->{$lc_metadata_value}->{$metadata_value}) {
+                $self->{$metadata_group . ".actualvalues"}->{$lc_metadata_value}->{$metadata_value}++;
+            } else {
+                $self->{$metadata_group . ".actualvalues"}->{$lc_metadata_value}->{$metadata_value} = 1;
+            }
+            }       
         }
         last if (@metadata_values > 0);
@@ -801 +811 @@
     # Otherwise create a sublist (bookshelf) for the metadata value
     else {
+        my $metadata_value_display = $self->get_metadata_value_display($metadata_group, $metadata_value);
         # Note that we don't need to convert from unicode-aware strings 
         # to utf8 here, as that is handled elsewhere in the code
-        my %child_classifier_node = ( 'Title' => $metadata_value, # 'Title' => $self->convert_unicode_string_to_utf8_string($metadata_value),
+        my %child_classifier_node = ( 'Title' => $metadata_value_display, # 'Title' => $self->convert_unicode_string_to_utf8_string($metadata_value),
                       'childtype' => "VList",
                       'mdtype' => $metadata_group,
@@ -918 +929 @@
 }
 
-
+sub get_metadata_value_display {
+    my $self = shift(@_);
+    my ($metadata_group, $metadata_value) = @_;
+    return $metadata_value if $self->{'standardize_capitalization'};
+    my $actual_values_hash = $self->{$metadata_group . ".actualvalues"}->{$metadata_value};
+    my $display_value ="";
+    my $max_count=0;
+    foreach my $v (keys %$actual_values_hash) {
+    if ($actual_values_hash->{$v} > $max_count) {
+        $display_value = $v;
+        $max_count = $actual_values_hash->{$v};
+    }
+    }
+    return $display_value;
+}
 1;

main/trunk/greenstone2/perllib/strings.properties

@@ -654 +654 @@
 List.sort_using_unicode_collation:Sort using the Unicode Collation Algorithm. Requires http://www.unicode.org/Public/UCA/latest/allkeys.txt file to be downloaded into perl's lib/Unicode/Collate folder.
 
+List.standardize_capitalization:Metadata values are lowercased for sorting into bookshelves. Set this option to use these lowercase values for bookshelf display names. Otherwise, the majority case variant will be used.
+
 List.use_hlist_for:Metadata fields to use a hlist rather than a vlist. Use ',' to separate the metadata groups and ';' to separate the metadata fields within each group.