Changeset 33899 for main

Timestamp:

2020-02-04T13:03:05+13:00 (4 years ago)

Author:

kjdon

Message:

pass in new casefold and accentfold options (BaseClassifier) to format_metadata_for_sorting

File:

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

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

@@ -229 +229 @@
     'desc' => "{List.metadata_sort.unicode} {List.sort_using_unicode_collation}",
     'type' => "flag" },
-
+      
       {'name' => "filter_metadata",
        'desc' => "{List.filter_metadata}",
@@ -525 +525 @@
     }
 
-    $first_metadata_group_element_value  = &sorttools::format_metadata_for_sorting($first_metadata_group, $first_metadata_group_element_value, $doc_obj) unless $self->{'no_metadata_formatting'};
+    $first_metadata_group_element_value  = &sorttools::format_metadata_for_sorting($first_metadata_group, $first_metadata_group_element_value, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'}) unless $self->{'no_metadata_formatting'};
     if (defined($first_metadata_group_element_value) && $first_metadata_group_element_value ne "") {
         # This section must be included in the classifier as we have found a value
@@ -568 +568 @@
             # 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
-            my $lc_metadata_value = lc($metadata_value);
-            $lc_metadata_value  = &sorttools::format_metadata_for_sorting($real_metadata_element, $lc_metadata_value, $doc_obj) unless $self->{'no_metadata_formatting'};
+            ### no longer do this, as lowercasing is now an option for the user, and is handled by format_metadata_for_sorting
+            my $lc_metadata_value = $metadata_value; #lc($metadata_value);
+            $lc_metadata_value  = &sorttools::format_metadata_for_sorting($real_metadata_element, $lc_metadata_value, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'}) unless $self->{'no_metadata_formatting'};
     
             # Add the metadata value into the list for this combination of metadata group 
             # and section - if we have some non-whitespace chars
-            # text that we have some non-whitespace chars
+            # test that we have some non-whitespace chars
             if ($lc_metadata_value =~ /\S/) {
             
@@ -1090 +1091 @@
     if (!$is_numeric || $numeric_partition_length == 1 ) {
     return substr($mvalue, 0, 1);
-    }
+    } 
     if ($numeric_partition_length == -1) {
     my ($all_digits) = $mvalue =~ /^([0-9]+)/;