Oops! Feeds have to have distinct shortnames.

diff --git a/sites b/sites
index aa38711..f3ee55a 100644 (file)
--- a/sites
+++ b/sites
@@ -2,6 +2,9 @@
 #   channel;feedshortname;colour;url
 #   NB that channel must have no leading '#' or it will be mistaken
 #   for a comment!
+#   
+#   NB. Every feed must have a different shortname or the cacheing
+#   will get screwed up.
 #
 # FIXME:  TODO: Reinstate the proper URL-encoding in the bot.
 #
@@ -13,10 +16,10 @@ beeb;bbc-tech;0;http://feeds.bbci.co.uk/news/technology/rss.xml
 #
 # Now that we report by guid, rather than by link, the BBC weather forecasts can work without a logic facelift:
 weather;Cambridge;2;http://newsrss.bbc.co.uk/weather/forecast/324/ObservationsRSS.xml
-weather;Cambridge;2;http://newsrss.bbc.co.uk/weather/forecast/324/Next3DaysRSS.xml
+weather;Cambridge forecast;2;http://newsrss.bbc.co.uk/weather/forecast/324/Next3DaysRSS.xml
 weather;Oxford;3;http://newsrss.bbc.co.uk/weather/forecast/25/ObservationsRSS.xml
-weather;Oxford;3;http://newsrss.bbc.co.uk/weather/forecast/25/Next3DaysRSS.xml
+weather;Oxford forecast;3;http://newsrss.bbc.co.uk/weather/forecast/25/Next3DaysRSS.xml
 #
 # OTOH the Met Office site, at least the warnings, have serial numbers...
-weather;meto-ee-warnings;2;http://www.metoffice.gov.uk/xml/warnings_rss_ee.xml
-weather;meto-se-warnings;3;http://www.metoffice.gov.uk/xml/warnings_rss_se.xml
+weather;Weather Warning EA;4;http://www.metoffice.gov.uk/xml/warnings_rss_ee.xml
+weather;Weather Warning SE;4;http://www.metoffice.gov.uk/xml/warnings_rss_se.xml

diff --git a/sites.test b/sites.test
index aa38711..f3ee55a 100644 (file)
--- a/sites.test
+++ b/sites.test
@@ -2,6 +2,9 @@
 #   channel;feedshortname;colour;url
 #   NB that channel must have no leading '#' or it will be mistaken
 #   for a comment!
+#   
+#   NB. Every feed must have a different shortname or the cacheing
+#   will get screwed up.
 #
 # FIXME:  TODO: Reinstate the proper URL-encoding in the bot.
 #
@@ -13,10 +16,10 @@ beeb;bbc-tech;0;http://feeds.bbci.co.uk/news/technology/rss.xml
 #
 # Now that we report by guid, rather than by link, the BBC weather forecasts can work without a logic facelift:
 weather;Cambridge;2;http://newsrss.bbc.co.uk/weather/forecast/324/ObservationsRSS.xml
-weather;Cambridge;2;http://newsrss.bbc.co.uk/weather/forecast/324/Next3DaysRSS.xml
+weather;Cambridge forecast;2;http://newsrss.bbc.co.uk/weather/forecast/324/Next3DaysRSS.xml
 weather;Oxford;3;http://newsrss.bbc.co.uk/weather/forecast/25/ObservationsRSS.xml
-weather;Oxford;3;http://newsrss.bbc.co.uk/weather/forecast/25/Next3DaysRSS.xml
+weather;Oxford forecast;3;http://newsrss.bbc.co.uk/weather/forecast/25/Next3DaysRSS.xml
 #
 # OTOH the Met Office site, at least the warnings, have serial numbers...
-weather;meto-ee-warnings;2;http://www.metoffice.gov.uk/xml/warnings_rss_ee.xml
-weather;meto-se-warnings;3;http://www.metoffice.gov.uk/xml/warnings_rss_se.xml
+weather;Weather Warning EA;4;http://www.metoffice.gov.uk/xml/warnings_rss_ee.xml
+weather;Weather Warning SE;4;http://www.metoffice.gov.uk/xml/warnings_rss_se.xml