--- Webpacus/lib/Webpacus/Model/Databases.pm	2006/01/07 17:34:16	348
+++ Webpacus/lib/Webpacus/Model/Databases.pm	2006/01/07 17:34:21	349
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 use base 'Catalyst::Model';
-use Text::Iconv;
+use Encode qw/decode/;
 
 =head1 NAME
 
@@ -30,17 +30,14 @@
 		$c->log->fail("didn't find databases in config");
 	$self->{log} = $c->log;
 
-	my $from = $c->config->{config_encoding};
-	my $to = $c->config->{catalyst_encoding};
-
-	$self->{iconv} = new Text::Iconv($from, $to) if ($from && $to);
+	$c->log->debug("using config encoding ", $self->config->{config_encoding});
 
 	return $self;
 }
 
 =head1 convert
 
-Convert encodings from C<config_encoding> to C<catalyst_encoding>
+Convert encodings from C<config_encoding>
 
   my $utf8 = $self->convert('foobar');
 
@@ -49,9 +46,8 @@
 sub convert {
 	my $self = shift;
 	my $val = shift || return;
-	return $val unless ($self->{iconv});
-
-	return $self->{iconv}->convert($val);
+	my $encoding = $self->config->{config_encoding} || return $val;
+	return decode($encoding, $val);
 }
 
 =head1 list_inputs