--- trunk/bin/irc-logger.pl 2008/03/07 00:18:02 87 +++ trunk/bin/irc-logger.pl 2008/03/07 00:31:58 88 @@ -55,8 +55,6 @@ my $DSN = 'DBI:Pg:dbname=' . $NICK; -# log output encoding -my $ENCODING = 'ISO-8859-2'; my $TIMESTAMP = '%Y-%m-%d %H:%M:%S'; my $sleep_on_error = 5; @@ -77,7 +75,6 @@ use POE qw(Component::IRC Wheel::FollowTail Component::Server::HTTP); use HTTP::Status; use DBI; -use Encode qw/from_to is_utf8/; use Regexp::Common qw /URI/; use CGI::Simple; use HTML::TagCloud; @@ -111,9 +108,7 @@ open(STDOUT, '>', $log_path) || warn "can't redirect log to $log_path: $!"; sub _log { - my $out = strftime($TIMESTAMP,localtime()) . ' ' . join(" ",@_) . $/; - from_to( $out, 'UTF-8', $ENCODING ); - print $out; + print strftime($TIMESTAMP,localtime()) . ' ' . join(" ",@_) . $/; } # LOG following @@ -177,6 +172,7 @@ }; my $dbh = DBI->connect($DSN,"","", { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr; +$dbh->do( qq{ set client_encoding = 'UTF-8' } ); my $sql_schema = { log => qq{ @@ -533,7 +529,6 @@ return unless ($arg->{id} && $arg->{message}); my $m = $arg->{message}; - from_to('UTF-8', 'iso-8859-2', $m) if (is_utf8($m)); my @tags; @@ -681,12 +676,11 @@ # $msg .= prefix( ' id ' , $entry->id ); if ( $args->{kernel} && $send_rss_msgs ) { - warn "# sending to $CHANNEL\n"; $send_rss_msgs--; + _log('RSS', $msg); + $sth_insert_log->execute( $CHANNEL, 1, $NICK, $msg, undef ); $args->{kernel}->post( $IRC_ALIAS => notice => $CHANNEL, $msg ); $updates++; - #$sth_insert_log->execute( $CHANNEL, 1, $NICK, $msg, undef ); - _log('RSS', $msg); } }