summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Morgan <smorgan@mythtv.org>2010-11-29 13:24:00 (GMT)
committer Stuart Morgan <smorgan@mythtv.org>2010-11-29 13:24:00 (GMT)
commitf1831b27d168234a268ae2b784d560dcc094908f (patch)
treea9ee3dd76661231bf3a9703f4a779ea1c9b687a4
parent549fca144da15e987f6d850d07d30a863666a49c (diff)
Backport [27337] to 0.24-fixes. Deal with an optional 's' in the BBC weather grabber when parsing strings like 'light snow shower(s)'.
git-svn-id: http://svn.mythtv.org/svn/branches/release-0-24-fixes@27371 7dbf422c-18fa-0310-86e9-fd20926502f2
-rwxr-xr-xmythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl4
-rwxr-xr-xmythplugins/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl4
2 files changed, 4 insertions, 4 deletions
diff --git a/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl b/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
index 84bc7e5..45fd8c5 100755
--- a/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
+++ b/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl
@@ -154,14 +154,14 @@ elsif ($weather_string =~ /^heavy rain$/i ||
}
elsif ($weather_string =~ /^thundery rain$/i ||
$weather_string =~ /^thunder storm$/i ||
- $weather_string =~ /^thundery showers$/i) {
+ $weather_string =~ /^thundery showers?$/i) {
printf "weather_icon::thunshowers.png\n";
}
elsif ($weather_string =~ /^heavy snow$/i) {
printf "weather_icon::snowshow.png\n";
}
elsif ($weather_string =~ /^light snow$/i ||
- $weather_string =~ /^light snow showers$/i) {
+ $weather_string =~ /^light snow showers?$/i) {
printf "weather_icon::flurries.png\n";
}
elsif ($weather_string =~ /^sleet$/i ||
diff --git a/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl b/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl
index 8c99c4e..1998c00 100755
--- a/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl
+++ b/mythplugins/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl
@@ -179,14 +179,14 @@ foreach $item (@{$xml->{channel}->{item}}) {
}
elsif ($weather_string =~ /^thundery rain$/i ||
$weather_string =~ /^thunder storm$/i ||
- $weather_string =~ /^thundery showers$/i) {
+ $weather_string =~ /^thundery showers?$/i) {
printf "icon-" . $i . "::thunshowers.png\n";
}
elsif ($weather_string =~ /^heavy snow$/i) {
printf "icon-" . $i . "::snowshow.png\n";
}
elsif ($weather_string =~ /^light snow$/i ||
- $weather_string =~ /^light snow showers$/i) {
+ $weather_string =~ /^light snow showers?$/i) {
printf "icon-" . $i . "::flurries.png\n";
}
elsif ($weather_string =~ /^sleet$/i ||