aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Whiteland <dave@mysociety.org>2012-03-15 14:07:07 +0000
committerDave Whiteland <dave@mysociety.org>2012-03-23 13:45:38 +0000
commit38f39f9154aeef60b012c088571aaa3121e3d388 (patch)
treeaf15af455b199beb1533cb5eb6f97846eb341abe
parent7778407c89259e9a770b86f3df9fa13186a7ca2a (diff)
strip street numbers from the nearest street for Barnet too
-rwxr-xr-xbin/send-reports8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/send-reports b/bin/send-reports
index 0782abc73..8ea43da11 100755
--- a/bin/send-reports
+++ b/bin/send-reports
@@ -470,10 +470,10 @@ sub post_barnet_message {
my ($nearest_postcode, $nearest_street);
for ($h{closest_address}) {
$nearest_postcode = sprintf("%-10s", $1) if /Nearest postcode [^:]+: ((\w{1,4}\s?\w+|\w+))/;
- # use partial postcode or comma as delimiter:
- # "Foo Street, London N11 1XX" becomes Foo Street
- # "Foo Street N11 1XX" becomes Foo Street
- $nearest_street = sprintf("%-30s", $1) if /Nearest road [^:]+: (.*?)(\b[A-Z]+\d|,|$)/m;
+ # use partial postcode or comma as delimiter, strip leading number (possible letter 221B) off too
+ # "99 Foo Street, London N11 1XX" becomes Foo Street
+ # "99 Foo Street N11 1XX" becomes Foo Street
+ $nearest_street = sprintf("%-30s", $1) if /Nearest road [^:]+: (?:\d+\w? )?(.*?)(\b[A-Z]+\d|,|$)/m;
}
my $postcode = $h{postcode} || $nearest_postcode; # use given postcode if available