Changeset 33902 for main/trunk

Timestamp:

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

Author:

kjdon

Message:

pass in new casefold and accentfold options to format_metadata_for_sorting

Location:

main/trunk/greenstone2/perllib/classify

Files:

• AZCompactList.pm (modified) (2 diffs)
• AZList.pm (modified) (1 diff)
• AZSectionList.pm (modified) (1 diff)
• DateList.pm (modified) (1 diff)
• Hierarchy.pm (modified) (1 diff)
• SectionList.pm (modified) (2 diffs)
• SimpleList.pm (modified) (2 diffs)

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

@@ -274 +274 @@
             $formatted_metavalue = $metavalue;
         } else {
-            $formatted_metavalue = &sorttools::format_metadata_for_sorting($self->{'metadata'},  $metavalue, $doc_obj);
+            $formatted_metavalue = &sorttools::format_metadata_for_sorting($self->{'metadata'},  $metavalue, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'});
         }
         
@@ -451 +451 @@
         }
 
-        $formatted_node = &sorttools::format_metadata_for_sorting($self->{'metadata'}, $formatted_node) unless $self->{'no_metadata_formatting'};
+        $formatted_node = &sorttools::format_metadata_for_sorting($self->{'metadata'}, $formatted_node, undef,  $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'}) unless $self->{'no_metadata_formatting'};
 
         # In case our formatted string is empty...

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

@@ -157 +157 @@
     
     
-    $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj) unless $self->{'no_metadata_formatting'};
+    $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'}) unless $self->{'no_metadata_formatting'};
     
     if (defined $self->{'list'}->{$doc_OID}) {

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

@@ -109 +109 @@
     }
     
-    $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj) unless $self->{'no_metadata_formatting'};
+    $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'}) unless $self->{'no_metadata_formatting'};
     if (defined $self->{'list'}->{"$doc_OID.$section"}) {
         my $outhandle = $self->{'outhandle'};

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

@@ -153 +153 @@
     if (defined $self->{'sort'} && $self->{'sort'} ne "") {
     $sort_other = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), $self->{'sort'});
-    $sort_other = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sort_other, $doc_obj) unless $self->{'no_metadata_formatting'};
+    $sort_other = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sort_other, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'}) unless $self->{'no_metadata_formatting'};
     }
     

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

@@ -168 +168 @@
         $sortmeta = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $self->{'sort'});
         if (defined $sortmeta && !$self->{'no_metadata_formatting'}) {
-        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sortmeta, $doc_obj);
+        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sortmeta, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'});
         }
     }

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

@@ -89 +89 @@
         $sortmeta = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $self->{'sort'});
         if (defined $sortmeta && !$self->{'no_metadata_formatting'}) {
-        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sortmeta, $doc_obj);
+        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sortmeta, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'});
         }
     }
@@ -146 +146 @@
     # sorting on the classification metadata
     # do the same formatting on the meta value as for sort meta
-    $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj) unless $self->{'no_metadata_formatting'};
+    $metavalue = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'}) unless $self->{'no_metadata_formatting'};
     $self->{'list'}->{"$doc_OID.$section"} = $metavalue;
     }

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

@@ -191 +191 @@
         $sortmeta = $doc_obj->get_metadata_element($doc_obj->get_top_section(), $self->{'sort'});
         if (defined $sortmeta && !$self->{'no_metadata_formatting'}) {
-        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sortmeta, $doc_obj);
+        $sortmeta = &sorttools::format_metadata_for_sorting($self->{'sort'}, $sortmeta, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'});
         }
     }
@@ -199 +199 @@
     # we add to the list based on metadata value
     # but we need to do the same formatting as for sort value
-    ($metavalue) = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj) unless $self->{'no_metadata_formatting'};
+    ($metavalue) = &sorttools::format_metadata_for_sorting($metaname, $metavalue, $doc_obj, $self->{'casefold_metadata_for_sorting'}, $self->{'accentfold_metadata_for_sorting'}) unless $self->{'no_metadata_formatting'};
     $self->{'list'}->{$doc_OID} = $metavalue;
     }