Changeset 24056

Show
Ignore:
Timestamp:
19.05.2011 15:34:24 (8 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm

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