Changeset 8735

Timestamp:

04/03/08 14:59:11 (5 years ago)

Author:

tokuhirom

Message:

HTTP-MobileAttribute?: eval とか激しいので、普通な感じで、capture しないようにしてみた。

Files:

• lang/perl/HTTP-MobileAttribute/trunk/lib/HTTP/MobileAttribute/CarrierDetector.pm (modified) (1 diff)

lang/perl/HTTP-MobileAttribute/trunk/lib/HTTP/MobileAttribute/CarrierDetector.pm

@@ -3 +3 @@
 use warnings;
 
-# Dynamically generate it!
-BEGIN
-{
-    # this matching should be robust enough
-    # detailed analysis is done in subclass's parse()
-    my $DoCoMoRE = '^DoCoMo\/\d\.\d[ \/]';
-    my $JPhoneRE = '^(?i:J-PHONE\/\d\.\d)';
-    my $VodafoneRE = '^Vodafone\/\d\.\d';
-    my $VodafoneMotRE = '^MOT-';
-    my $SoftBankRE = '^SoftBank\/\d\.\d';
-    my $SoftBankCrawlerRE = '^Nokia[^\/]+\/\d\.\d';
-    my $EZwebRE  = '^(?:KDDI-[A-Z]+\d+[A-Z]? )?UP\.Browser\\/';
-    my $AirHRE = '^Mozilla\/3\.0\((?:WILLCOM|DDIPOCKET)\;';
+# this matching should be robust enough
+# detailed analysis is done in subclass's parse()
+our $DoCoMoRE = '^DoCoMo\/\d\.\d[ \/]';
+our $JPhoneRE = '^(?i:J-PHONE\/\d\.\d)';
+our $VodafoneRE = '^Vodafone\/\d\.\d';
+our $VodafoneMotRE = '^MOT-';
+our $SoftBankRE = '^SoftBank\/\d\.\d';
+our $SoftBankCrawlerRE = '^Nokia[^\/]+\/\d\.\d';
+our $EZwebRE  = '^(?:KDDI-[A-Z]+\d+[A-Z]? )?UP\.Browser\\/';
+our $AirHRE = '^Mozilla\/3\.0\((?:WILLCOM|DDIPOCKET)\;';
 
-    # We use a list instead of a hash here, because the order matters.
-    # we check from the most likely to least likely
-    my @map = (
-        DoCoMo     => [ $DoCoMoRE ],
-        ThirdForce => [ $JPhoneRE, $VodafoneRE, $VodafoneMotRE, $SoftBankRE, $SoftBankCrawlerRE ],
-        EZweb      => [ $EZwebRE ],
-        AirHPhone  => [ $AirHRE ]
-    );
+sub detect {
+    my $user_agent = shift;
 
-    my $code = <<EOM;
-sub detect {
-    my \$user_agent = shift;
-EOM
-    my $not_first = 0;
-    while (@map) {
-        my ($key, $re_list) = (shift @map, shift @map);
-        my $re = join('|', @$re_list);
-        $code .= sprintf( <<EOM, $not_first++ ? '} elsif' : 'if', $key);
-    %s (\$user_agent =~ /$re/) {
-        return '%s';
-EOM
-    }
-
-    $code .= <<EOM;
+    if ( $user_agent =~ /$DoCoMoRE/ ) {
+        return 'DoCoMo';
+    } elsif ( $user_agent =~ /$JPhoneRE|$VodafoneRE|$VodafoneMotRE|$SoftBankRE|$SoftBankCrawlerRE/) {
+        return 'ThirdForce';
+    } elsif ( $user_agent =~ /$EZwebRE/ ) {
+        return 'EZweb';
+    } elsif ( $user_agent =~ /$AirHRE/ ) {
+        return 'AirHPhone';
     }
     return 'NonMobile';
 }
-EOM
 
-    eval $code;
-    die "$@\n$code" if $@;
-}
         
 1;