Changeset 3719

Timestamp:

2003-01-28T13:48:33+13:00 (21 years ago)

Author:

sjboddie

Message:

Prevent dodgy format_string_english() functions from destroying any
non-english text that might come by.

Location:

trunk/gsdl/perllib/classify

Files:

• AZList.pm (modified) (2 diffs)
• Hierarchy.pm (modified) (2 diffs)
• List.pm (modified) (1 diff)

trunk/gsdl/perllib/classify/AZList.pm

@@ -124 +124 @@
                             $self->{'metaname'});
 
+    my $lang = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), 'Language');
+
     # if this document doesn't contain the metadata element we're
     # sorting by we won't include it in this classification
@@ -135 +137 @@
         $metavalue = $iso639::fromiso639{$metavalue};
     } elsif ($self->{'metaname'} eq 'Creator') {
-        &sorttools::format_string_name_english (\$metavalue);
+        if ($lang eq 'en') {
+        &sorttools::format_string_name_english (\$metavalue);
+        }
     } else {
-        &sorttools::format_string_english (\$metavalue);
+        if ($lang eq 'en') { 
+        &sorttools::format_string_english (\$metavalue);
+        }
     }
     if (defined $self->{'list'}->{$doc_OID}) {

trunk/gsdl/perllib/classify/Hierarchy.pm

@@ -201 +201 @@
                        $self->{'metaname'});
     
+    my $lang = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), 'Language');
+
     my $sortmeta = "";
     if (defined $self->{'sortname'}) {
@@ -210 +212 @@
         if (defined $sortmeta) {
         if ($self->{'sortname'} eq "Creator") {
-            &sorttools::format_string_name_english (\$sortmeta);
+            if ($lang eq 'en') {
+            &sorttools::format_string_name_english (\$sortmeta);
+            }
         } else {
-            &sorttools::format_string_english (\$sortmeta);
+            if ($lang eq 'en') {
+            &sorttools::format_string_english (\$sortmeta);
+            }
         }
         }

trunk/gsdl/perllib/classify/List.pm

@@ -164 +164 @@
                                $self->{'sortname'});
         if (defined $sortmeta) {
-        if ($self->{'sortname'} eq "Creator") {
-            &sorttools::format_string_name_english (\$sortmeta);
-        } else {
-            &sorttools::format_string_english (\$sortmeta);
+        
+        my $lang = $doc_obj->get_metadata_element ($doc_obj->get_top_section(), 'Language');
+        if ($lang eq 'en') {
+            if ($self->{'sortname'} eq "Creator") {
+            &sorttools::format_string_name_english (\$sortmeta);
+            } else {
+            &sorttools::format_string_english (\$sortmeta);
+            }
         }
         }