diff options
| author | matthew <matthew> | 2007-08-24 22:35:51 +0000 |
|---|---|---|
| committer | matthew <matthew> | 2007-08-24 22:35:51 +0000 |
| commit | e721d4a3d45577969a68289911b1d538ca0ffd16 (patch) | |
| tree | e1584e32c43dabb3c2ceb439d8e17635d20fa9c0 | |
| parent | 5531d0e3bc8860c17e1f75fa99688bc0d1d6897e (diff) | |
Allow path_infos as well as query_strings in RSS. Way of passing array
and hash parameters to RABX command line program.
| -rwxr-xr-x | web/flickr2.cgi | 4 | ||||
| -rwxr-xr-x | web/rss.cgi | 12 | ||||
| -rw-r--r-- | web/xsl.xsl | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/web/flickr2.cgi b/web/flickr2.cgi index 71cc07f39..1817ba9b0 100755 --- a/web/flickr2.cgi +++ b/web/flickr2.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: flickr2.cgi,v 1.1 2007-06-17 09:40:51 matthew Exp $ +# $Id: flickr2.cgi,v 1.2 2007-08-24 22:35:51 matthew Exp $ use strict; require 5.8.0; @@ -49,7 +49,7 @@ sub main { $title = uri_escape($title); # XXX: Look up some of this stuff at the destination instead??? print $q->redirect("/?flickr=$token;submit_map=1;easting=$e;northing=$n;name=$name;email=$email;title=$title;anonymous=1"); - exit; + return; } $out = $q->p("That report appears to have been checked already."); } else { diff --git a/web/rss.cgi b/web/rss.cgi index d0ca44755..aba53b1c0 100755 --- a/web/rss.cgi +++ b/web/rss.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: rss.cgi,v 1.15 2007-06-18 20:13:22 matthew Exp $ +# $Id: rss.cgi,v 1.16 2007-08-24 22:35:51 matthew Exp $ use strict; require 5.8.0; @@ -56,7 +56,7 @@ sub main { } else { die "Missing x/y or lat/lon parameter in RSS feed"; } - my $qs = "x=$x;y=$y"; + my $qs = "?x=$x;y=$y"; my $d = $q->param('d'); if ($d) { @@ -70,13 +70,17 @@ sub main { mySociety::Alert::generate_rss($type, $qs, $e, $n, $d); } elsif ($type eq 'new_updates') { my $id = $q->param('id'); - my $qs = 'id='.$id; + my $qs = '?id='.$id; mySociety::Alert::generate_rss($type, $qs, $id); } elsif ($type eq 'new_problems') { mySociety::Alert::generate_rss($type, ''); } elsif ($type eq 'council_problems') { my $id = $q->param('id'); - my $qs = 'council='.$id; + my $qs = '/'.$id; + mySociety::Alert::generate_rss($type, $qs, $id); + } elsif ($type eq 'area_problems') { + my $id = $q->param('id'); + my $qs = '/'.$id; mySociety::Alert::generate_rss($type, $qs, $id); } elsif ($type eq 'all_problems') { mySociety::Alert::generate_rss($type, ''); diff --git a/web/xsl.xsl b/web/xsl.xsl index cbb11062f..1f0755870 100644 --- a/web/xsl.xsl +++ b/web/xsl.xsl @@ -37,7 +37,7 @@ href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code< <p>This is an RSS feed from the FixMyStreet website. RSS feeds allow you to stay up to date with the latest changes and additions to the site. To subscribe to it, you will need a News Reader or other similar device. <br/> - <a href="http://news.bbc.co.uk/1/hi/help/3223484.stm#whatisrss"><strong>Help</strong>, I don't know what a news reader is and still don't know what this is about (from the BBC).</a></p> + <a href="http://news.bbc.co.uk/1/hi/help/3223484.stm#whatisrss"><strong>Help</strong>, I don't know what a news reader is and still don't know what this is about <small>(from the BBC)</small>.</a></p> </div> <p>Below is the latest content available from this feed, |