Changeset 24193

Timestamp:

2011-06-22T18:31:37+12:00 (12 years ago)

Author:

ak19

Message:

Non-English characters in the user-entered buttonname of all classifiers need to be preserved. BaseClassifier now does this, for which it has to assume that the user-entered buttonname is in UTF-8

Location:

main/trunk/greenstone2/perllib

Files:

• classify/BaseClassifier.pm (modified) (3 diffs)
• classify/List.pm (modified) (1 diff)
• unicode.pm (modified) (1 diff)

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

@@ -56 +56 @@
 use printusage;
 use parse2;
+use unicode;
 
 # suppress the annoying "subroutine redefined" warning that various
@@ -278 +279 @@
     
     delete $self->{"info_only"};
+    # user-entered UTF-8 display meta for buttonname. Needs to be internally turned into unicode
+    # (will later be turned back to UTF-8 along with the rest of the metadata)
+    if ($self->{'buttonname'}) {
+        $self->{'buttonname'} = &unicode::convert_utf8_string_to_unicode_string($self->{'buttonname'});
+    }
     return bless $self, $class;
 }
@@ -369 +375 @@
 }
 
+
 # ex. can be at front, or it may be a list of metadata, separated by ,/; 
 sub strip_ex_from_metadata {

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

@@ -680 +680 @@
 
 
-sub convert_utf8_string_to_unicode_string
-{
-    my $self = shift(@_);
-    my $utf8_string = shift(@_);
-
-    my $unicode_string = "";
-    foreach my $unicode_value (@{&unicode::utf82unicode($utf8_string)}) {
-    $unicode_string .= chr($unicode_value);
-    }
-    return $unicode_string;
-}
-
-
-sub convert_unicode_string_to_utf8_string
-{
-    my $self = shift(@_);
-    my $unicode_string = shift(@_);
-
-    my @unicode_array;
-    for (my $i = 0; $i < length($unicode_string); $i++) {
-    push(@unicode_array, ord(substr($unicode_string, $i, 1)));
-    }
-    return &unicode::unicode2utf8(\@unicode_array);
-}
-
-
 sub generate_partition_start
 {

main/trunk/greenstone2/perllib/unicode.pm

@@ -848 +848 @@
 
 
+sub convert_utf8_string_to_unicode_string
+{
+    my $utf8_string = shift(@_);
+
+    my $unicode_string = "";
+    foreach my $unicode_value (@{&unicode::utf82unicode($utf8_string)}) {
+    $unicode_string .= chr($unicode_value);
+    }
+    return $unicode_string;
+}
+
+sub convert_unicode_string_to_utf8_string
+{
+    my $unicode_string = shift(@_);
+
+    my @unicode_array;
+    for (my $i = 0; $i < length($unicode_string); $i++) {
+    push(@unicode_array, ord(&substr($unicode_string, $i, 1)));
+    }
+    return &unicode::unicode2utf8(\@unicode_array);
+}
+
+
 1;