--- trunk/WebPac.pm	2003/01/11 19:55:30	9
+++ trunk/WebPac.pm	2003/01/16 17:35:54	10
@@ -6,15 +6,14 @@
 use HTML::Pager;
 use HTML::FillInForm;
 use SWISH;
-use Unicode::String qw(utf8 utf16);
-require Unicode::Map8;
+use Unicode::MapUTF8 qw(to_utf8 from_utf8 utf8_supported_charset);
 use DBI;
 
 # configuration options
 # FIX: they really should go in configuration file!
 my $TEMPLATE_PATH = '/data/webpac/template_html';
 my $CHARSET = 'ISO-8859-2';
-my $SWISH = '/data/swish/swish-e';
+my $SWISH = '/usr/local/bin/swish-e';
 my $INDEX = '/data/webpac/index/isis.index';
 my $MAX_HITS = 500;
 my $ON_PAGE = 10;
@@ -91,9 +90,6 @@
 
 	my $tmpl = $self->load_tmpl('results.html');
 
-	my $l2_map = Unicode::Map8->new($CHARSET) || die;
-	my $us = Unicode::String->new();
-
 	# call swish
 	my $sh = SWISH->connect('Fork',
 		prog     => $SWISH,
@@ -102,12 +98,10 @@
 		results  => sub {
 			my ($sh,$hit) = @_;
 
-			$us->utf8($hit->swishtitle);
-
 			push @swish_results, {
 				nr => ($#swish_results + 2),
 				path => $hit->swishdocpath,
-				title => $l2_map->to8($us->utf16),
+				title => to_utf8({ -string => $hit->swishtitle, -charset => $CHARSET }),
 				rank => $hit->swishrank };
 
 #			my @fields = $hit->field_names;