Changeset 24056 for main/trunk/greenstone2

Timestamp:

2011-05-19T15:34:24+12:00 (13 years ago)

Author:

ak19

Message:

One of the two changes made in this file's previous commit to fix the unicode handling of PagedImagePlugin was wrong: text item files don't additional decoding into UTF8, that's already handled by the ReadTextFile read operation that's called.

File:

• main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm

@@ -635 +635 @@
     while (defined ($line = <ITEMFILE>)) {
     
-    # text read in by XML::Parser is in Perl's binary byte value
-    # form ... need to explicitly make it UTF-8
-    $line = decode("utf-8",$line);
+    # Since process_item is called not on an XML item file, but a text item file
+    # don't decode into UTF8 the text that was read in, since it's already UTF-8    
+    #$line = decode("utf-8",$line);
     
     next unless $line =~ /\w/;