Changeset 13372


Ignore:
Timestamp:
2006-11-29T14:35:04+13:00 (16 years ago)
Author:
mdewsnip
Message:

Fixed a couple of encoding problems.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/cic-hcap/perllib/plugins/CICPlug.pm

    r13201 r13372  
    10421042    $metadata_name =~ s/ /_/g;
    10431043
    1044     # Anything from the database is ISO 8859-1 encoded, so convert to UTF-8
    1045     $metadata_value = &unicode::ascii2utf8(\$metadata_value);
     1044    # Anything from the database is Windows-1252 encoded, so convert to UTF-8
     1045    $metadata_value = &unicode::unicode2utf8(&unicode::convert2unicode("windows_1252", \$metadata_value));
    10461046
    10471047    # Escape any '[' and ']' characters so Greenstone doesn't try to treat the text as metadata...
     
    12921292        $anchor_name = $letter;
    12931293    }
    1294     print BROWSER_MACROFILE &get_static_browser_macro_chunk($letter, $anchor_name, \@letter_ids, $id_to_name_mapping, $id_to_extra_mapping);
     1294    my $static_browser_macro_chunk = &get_static_browser_macro_chunk($letter, $anchor_name, \@letter_ids, $id_to_name_mapping, $id_to_extra_mapping);
     1295    print BROWSER_MACROFILE &unicode::unicode2utf8(&unicode::convert2unicode("windows_1252", \$static_browser_macro_chunk));
    12951296    }
    12961297    print BROWSER_MACROFILE "</table>\n";
Note: See TracChangeset for help on using the changeset viewer.