use HTML::Pager;
use HTML::FillInForm;
use SWISH;
-use Unicode::MapUTF8 qw(to_utf8 from_utf8 utf8_supported_charset);
+use Text::Iconv;
use DBI;
use lib '..';
my $MAX_HITS = 500;
my $ON_PAGE = 10;
+Text::Iconv->raise_error(1); # Conversion errors raise exceptions
+
+my $from_utf8 = Text::Iconv->new('UTF8', $CHARSET);
sub setup {
my $self = shift;
push @swish_results, {
nr => ($#swish_results + 2),
path => $hit->swishdocpath,
- headline => from_utf8({ -string => $hit->headline, -charset => $CHARSET }),
- html => back2html(from_utf8({ -string => $hit->html, -charset => $CHARSET })),
+ headline => $from_utf8->convert($hit->headline),
+ html => back2html($from_utf8->convert($hit->html)),
rank => $hit->swishrank };
},