Changeset 24745 for main/trunk/greenstone2

Timestamp:

2011-10-10T15:01:45+13:00 (13 years ago)

Author:

ak19

Message:

Removed code that was added in a recent commit and is no longer used: to do with getting accents in classifier buttonnames to be preserved. The previous fix was to treat buttonname as raw bytedata and call the old method to convert to unicode. Dr Bainbridge then fixed it much better: colcfg, which stores the buttonname, is now read in as unicode aware strings, so no conversion to unicode is necessary anymore.

File:

• main/trunk/greenstone2/perllib/classify/BaseClassifier.pm (modified) (2 diffs)

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

@@ -56 +56 @@
 use printusage;
 use parse2;
-use unicode;
 
 # suppress the annoying "subroutine redefined" warning that various
@@ -280 +279 @@
     delete $self->{"info_only"};
 
-# The following is no longer needed as we now ensure that when text files are
-# read in, there are straightaway made to be Unicode aware strings in Perl
-    
-#   # 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'});
-#   }
+# We now ensure that when text files (and even colcfg) are read in, 
+# they are straightaway made to be Unicode aware strings in Perl
+    
     return bless $self, $class;
 }