Changeset 5601

Timestamp:

01/27/08 09:47:18 (5 years ago)

Author:

tokuhirom

Message:

use HTTP::MobileAgent::Plugin::Charset;

Location:

lang/perl/mobirc/trunk/mobirc

Files:

• Makefile.PL (modified) (1 diff)
• lib/Mobirc/HTTPD.pm (modified) (1 diff)
• lib/Mobirc/HTTPD/Controller.pm (modified) (4 diffs)

lang/perl/mobirc/trunk/mobirc/Makefile.PL

@@ -35 +35 @@
 requires 'CSS::Tiny';
 requires 'Encode::JP::Mobile';
+requires 'HTTP::MobileAgent::Plugin::Charset';
 
 features(

lang/perl/mobirc/trunk/mobirc/lib/Mobirc/HTTPD.pm

@@ -20 +20 @@
 use UNIVERSAL::require;
 use HTTP::MobileAgent;
+use HTTP::MobileAgent::Plugin::Charset;
 
 use Mobirc;

lang/perl/mobirc/trunk/mobirc/lib/Mobirc/HTTPD/Controller.pm

@@ -15 +15 @@
 use List::Util qw/first/;
 use Template::Provider::Encoding;
+use Encode::JP::Mobile 0.24;
 
 use Mobirc;
@@ -128 +129 @@
     my $r       = CGI->new( $c->{req}->content );
     my $message = $r->param('msg');
-    $message = decode( _get_charset($c), $message );
+    $message = decode( $c->{mobile_agent}->encoding, $message );
 
     DEBUG "POST MESSAGE $message";
@@ -239 +240 @@
     DEBUG "rendering done";
 
-    my $content = encode( _get_charset($c), $out);
+    my $content = encode( $c->{mobile_agent}->encoding, $out);
     $content = _html_filter($c, $content);
 
@@ -328 +329 @@
 }
 
-# FIXME I want to use HTTP::MobileAgent::Plugin::Charset
-sub _get_charset {
-    my ($c, ) = @_;
-
-    my $charset = $c->{config}->{httpd}->{charset} || 'shift_jis-mobile-auto';
-
-    if ($charset =~ /^shift_jis-.+/) {
-        require Encode::JP::Mobile;
-    }
-
-    if ($charset eq 'shift_jis-mobile-auto') {
-        my $agent = $c->{mobile_agent};
-        if ($agent->is_non_mobile) {
-            $charset = 'utf8';
-        } else {
-            $charset = 'shift_jis-' . lc $agent->carrier_longname;
-        }
-    }
-
-    DEBUG "use charset: $charset";
-
-    return $charset;
-}
-
 1;