From d1020f6d455aa729ca52d18ccb39d531a866f4fc Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Fri, 9 Sep 2011 19:24:09 +0100 Subject: sort of working rss address stuff with db caching and populate script --- perllib/FixMyStreet/App/Controller/Rss.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'perllib/FixMyStreet/App/Controller/Rss.pm') diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index 767d38c21..c2a0eee7e 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -265,8 +265,9 @@ sub add_row : Private { } if ( $row->{used_map} ) { - #my $address = $c->cobrand->find_closest_address_for_rss( $row->{latitude}, $row->{longitude} ); - #$item{description} .= ent("\n
$address"); + # TODO: uncomment these when the populate script has been run + # my $address = $c->cobrand->find_closest_address_for_rss( $row->{latitude}, $row->{longitude}, $row ); + # $item{description} .= ent("\n
$address"); } my $recipient_name = $c->cobrand->contact_name; -- cgit v1.2.3 From 13ade239723d21fd1a288f0225e134ef4f21f8fc Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Mon, 28 Nov 2011 16:18:24 +0000 Subject: add postcode to problem title in Rss feed --- perllib/FixMyStreet/App/Controller/Rss.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'perllib/FixMyStreet/App/Controller/Rss.pm') diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index 6152f5a17..8b98433bb 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -250,6 +250,11 @@ sub add_row : Private { (my $link = $alert_type->item_link) =~ s/{{(.*?)}}/$row->{$1}/g; (my $desc = _($alert_type->item_description)) =~ s/{{(.*?)}}/$row->{$1}/g; my $url = $c->uri_for( $link ); + + if ( $row->{postcode} ) { + $title .= ", $row->{postcode}"; + } + my %item = ( title => ent($title), link => $url, @@ -267,7 +272,7 @@ sub add_row : Private { if ( $row->{used_map} ) { # TODO: uncomment these when the populate script has been run # my $address = $c->cobrand->find_closest_address_for_rss( $row->{latitude}, $row->{longitude}, $row ); - # $item{description} .= ent("\n
$address"); + # $item{description} .= ent("\n
$address") if $address; } my $recipient_name = $c->cobrand->contact_name; -- cgit v1.2.3 From 7b84603eba13109bee0d39b2bb48d6e55371f8ec Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Mon, 28 Nov 2011 17:35:43 +0000 Subject: include nearest road data in rss feed if available, plus tests --- perllib/FixMyStreet/App/Controller/Rss.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'perllib/FixMyStreet/App/Controller/Rss.pm') diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index 8b98433bb..20c839208 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -270,9 +270,8 @@ sub add_row : Private { } if ( $row->{used_map} ) { - # TODO: uncomment these when the populate script has been run - # my $address = $c->cobrand->find_closest_address_for_rss( $row->{latitude}, $row->{longitude}, $row ); - # $item{description} .= ent("\n
$address") if $address; + my $address = $c->cobrand->find_closest_address_for_rss( $row->{latitude}, $row->{longitude}, $row ); + $item{description} .= ent("\n
$address") if $address; } my $recipient_name = $c->cobrand->contact_name; -- cgit v1.2.3 From d4fbdc003253456acade79af4b5e1fcdae34ce02 Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Tue, 29 Nov 2011 15:35:19 +0000 Subject: canonicalise postcode for display in RSS titles --- perllib/FixMyStreet/App/Controller/Rss.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'perllib/FixMyStreet/App/Controller/Rss.pm') diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index 20c839208..3a0fa0c04 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -252,7 +252,10 @@ sub add_row : Private { my $url = $c->uri_for( $link ); if ( $row->{postcode} ) { - $title .= ", $row->{postcode}"; + my $pc = $row->{postcode}; + $pc = mySociety::PostcodeUtil::canonicalise_postcode($pc) + if mySociety::PostcodeUtil::is_valid_postcode($pc); + $title .= ", $pc"; } my %item = ( -- cgit v1.2.3 From 766d957ecfb95cb867b15282299c8c831126665d Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Tue, 29 Nov 2011 18:46:10 +0000 Subject: use format_postcode in rss feeds as well --- perllib/FixMyStreet/App/Controller/Rss.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'perllib/FixMyStreet/App/Controller/Rss.pm') diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index 3a0fa0c04..abb32bc7c 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -252,9 +252,7 @@ sub add_row : Private { my $url = $c->uri_for( $link ); if ( $row->{postcode} ) { - my $pc = $row->{postcode}; - $pc = mySociety::PostcodeUtil::canonicalise_postcode($pc) - if mySociety::PostcodeUtil::is_valid_postcode($pc); + my $pc = $c->cobrand->format_postcode( $row->{postcode} ); $title .= ", $pc"; } -- cgit v1.2.3