Changeset 3079 for lang/perl/HTTP-MobileAgent

Timestamp:

12/12/07 09:54:13 (6 years ago)

Author:

tokuhirom

Message:

lang/perl/HTTP-MobileAgent?: trying to use WWW::MobileCarrierJP

Location:

lang/perl/HTTP-MobileAgent/branches/feature-WWWMobileCarrierJP

Files:

• Makefile.PL (modified) (1 diff)
• bin/makedocomomap (modified) (2 diffs)
• bin/makexmldocomomap (modified) (2 diffs)

lang/perl/HTTP-MobileAgent/branches/feature-WWWMobileCarrierJP/Makefile.PL

@@ -6 +6 @@
         'Test::More' => 0.32,
         'HTTP::Headers' => 1.43,
+        'WWW::MobileCarrierJP' => 0.04,
     },
 );

lang/perl/HTTP-MobileAgent/branches/feature-WWWMobileCarrierJP/bin/makedocomomap

@@ -3 +3 @@
 use utf8;
 use FindBin;
-use LWP::Simple;
 use Data::Dumper;
 use HTTP::MobileAgent;
 use Encode;
 use File::Spec;
-
-my $URL =
-'http://www.nttdocomo.co.jp/service/imode/make/content/spec/screen_area/index.html';
+use WWW::MobileCarrierJP::DoCoMo::Display;
 
 do_task(@ARGV);
 
 sub do_task {
-    my $html = decode( 'cp932', get($URL) );
-    $html =~ s/(?:\r?\n)+/\n/g;
-    $html =~ s/μ/myu/g;
-    my $re = regexp();
+    my $dat = WWW::MobileCarrierJP::DoCoMo::Display->scrape;
     my %map;
-    while ( $html =~ /$re/igs ) {
-        my ( $model, $width, $height, $color, $depth ) = ( $1, $2, $3, $4, $5 );
-        $map{ uc($model) } = {
-            width  => $width,
-            height => $height,
-            color  => $color eq 'カラー',
-            depth  => $depth,
+    for my $phone (@$dat) {
+        $map{ uc $phone->{model} } = +{
+            width  => $phone->{width},
+            height => $phone->{height},
+            color  => $phone->{is_color},
+            depth  => $phone->{depth},
         };
     }
@@ -86 +79 @@
 }
 
-sub regexp {
-    return <<'RE';
-<td><span class="txt">([A-Z]+\d+\w*\+?).*?</span></td>
-<td><span class="txt">.*?(?:</span></td>)?
-<td><span class="txt">.*?(?:</span></td>)?
-<td><span class="txt">.*?(\d+)×(\d+).*?</span></td>
-<td>.*?</td>
-<td><span class="txt">(白黒|カラー)(?:.*?)(\d+)(?:色|階調)</span></td>
-RE
-}

lang/perl/HTTP-MobileAgent/branches/feature-WWWMobileCarrierJP/bin/makexmldocomomap

@@ -3 +3 @@
 use warnings;
 use utf8;
-use LWP::Simple;
 use XML::Simple ();
 use Encode;
-
-my $URL =
-'http://www.nttdocomo.co.jp/service/imode/make/content/spec/screen_area/index.html';
+use WWW::MobileCarrierJP::DoCoMo::Display;
 
 do_task(@ARGV);
 
 sub do_task {
-    my $html = decode( 'cp932',  get($URL) );
-    $html =~ s/(?:\r?\n)+/\n/g;
-    $html =~ s/μ/myu/g;
-    my $re = regexp();
+    my $dat = WWW::MobileCarrierJP::DoCoMo::Display->scrape;
     my %map;
-    while ( $html =~ /$re/igs ) {
-        my ( $model, $width, $height, $color, $depth ) = ( $1, $2, $3, $4, $5 );
-        push @{ $map{terminal} },
-          {
-            model  => uc($model),
-            width  => $width,
-            height => $height,
-            color  => $color eq 'カラー',
-            depth  => $depth,
-          };
+    for my $phone (@$dat) {
+        $map{ uc $phone->{model} } = +{
+            width  => $phone->{width},
+            height => $phone->{height},
+            color  => $phone->{is_color},
+            depth  => $phone->{depth},
+        };
     }
     output_code( \%map );
@@ -41 +32 @@
 }
 
-sub regexp {
-    return <<'RE';
-<td><span class="txt">([A-Z]+\d+\w*\+?).*?</span></td>
-<td><span class="txt">.*?(?:</span></td>)?
-<td><span class="txt">.*?(?:</span></td>)?
-<td><span class="txt">.*?(\d+)×(\d+).*?</span></td>
-<td>.*?</td>
-<td><span class="txt">(白黒|カラー)(?:.*?)(\d+)(?:色|階調)</span></td>
-RE
-}