Changeset 1576

Timestamp:

11/15/07 16:03:33 (12 months ago)

Author:

yappo

Message:

r14@haruna (orig r12): ko | 2006-07-11 13:27:45 +0900
add filters

Location:

lang/perl/Geography-AddressExtract-Japan/trunk

Files:

• lib/Geography/AddressExtract/Japan.pm (modified) (1 diff)
• lib/Geography/AddressExtract/Japan/Filter (added)
• lib/Geography/AddressExtract/Japan/Normalize (deleted)
• lib/Geography/AddressExtract/Japan/Normalize.pm (deleted)
• test.pl (modified) (1 diff)

lang/perl/Geography-AddressExtract-Japan/trunk/lib/Geography/AddressExtract/Japan.pm

@@ -116 +116 @@
     }
 
-    if ($opt->{aza} && $opt->{aza} =~ /\p{Han}+([�Ƥˤ�ؤΤˤ���].*)$/) {
+    if ($opt->{aza} && $opt->{aza} =~ /\p{Han}([�Ƥˤ�ؤΤˤ���])$/) {
         my $prefix = $1;
         $opt->{aza} =~ s/$prefix$//;
         $opt->{number} = '';
         $opt->{match_text} =~ s/($opt->{aza}).+$/$1/;
+    }
+
+    if ($opt->{aza} && $opt->{aza} =~ /^(?:[�̱]|���|�İ����߽�)$/) {
+        $opt->{aza} = '';
+        $opt->{number} = '';
+        $opt->{match_text} = $opt->{city};
     }
 

lang/perl/Geography-AddressExtract-Japan/trunk/test.pl

@@ -78 +78 @@
 
 ���Ա�Į�ˤ���K
+
+�������ɶ迷��54-1
+078-959
 ');