Changeset 189

Timestamp:

03/10/06 15:54:03 (3 years ago)

Author:

ogawa

Message:

Regular expresssions for capturing addresses become to be more robust.

Files:

• Mapper/trunk/Mapper.pl (modified) (4 diffs)

Mapper/trunk/Mapper.pl

@@ -52 +52 @@
 
     defined(my $html = $ctx->stash('builder')->build($ctx, $ctx->stash('tokens'), $cond)) or return;
-    $html =~ s!(?:<div\s+[^<]*class="adr"[^<]*>\s*([^<]+)\s*</div>)|(?:<p>\s*\[map:([^]]+)\]\s*</p>)!$mapper->generate($1||$2)!ge;
+    $html =~ s!(?:<(?:div|p)\s+[^<>]*class="adr"[^<>]*>\s*([^<>]+)\s*</(?:div|p)>)|(?:<(?:div|p)[^<>]*>\s*\[map:([^]]+)\]\s*</(?:div|p)>)!$mapper->generate($1||$2)!ge;
     $html;
 }
@@ -91 +91 @@
     my $this = shift;
     my($address) = @_;
+    $address =~ s/(^\s+|\s+$)//g;
     my ($lat, $lon) = eval { $this->resolve_address($address) };
     return "<div class=\"adr\">$address (Sorry, this address cannot be resolved.)</div>" if $@;
@@ -122 +123 @@
     var old = window.onload;
     window.onload = (typeof old != 'function') ?
-        func : function(evt) { old(evt); return func(evt); };
+        func : function(e) { old(e); return func(e); };
 }
 function generateGMap(mapid, address, latitude, longitude, maptype, zoom) {
@@ -212 +213 @@
     my $this = shift;
     my($address) = @_;
+    $address =~ s/(^\s+|\s+$)//g;
     my($adr, $opt) = split(/:/, $address);
     $adr = MT::I18N::encode_text($adr, '', 'euc-jp') || '';