X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FModules%2FWeather.pl;fp=src%2FModules%2FWeather.pl;h=d2a957769c6442aee55afc312061ff6e3cb20665;hb=766118d9e5eab30a00af45b09aeb6b5e8288f658;hp=2cdf25b10dc7e1ae2f2c8484365bfd961d6e18e8;hpb=66cb28e55db2670c68b93f35904d9ed134355708;p=infobot.git

diff --git a/src/Modules/Weather.pl b/src/Modules/Weather.pl
index 2cdf25b..d2a9577 100644
--- a/src/Modules/Weather.pl
+++ b/src/Modules/Weather.pl
@@ -60,10 +60,8 @@ sub queryText {
 	}
 
 	$content = $response->content;
-	$content =~ s|.*?current weather conditions.*?<BR>([^<]*)<.*?</TR>||is;
+	$content =~ s|.*?current weather conditions.*?<BR>([^<]*?)\s*<.*?</TR>||is;
 	my $place = $1;
-	$content =~ s|.*?<TR>(?:\s*<[^>]+>)*\s*([^<]+)\s<.*?</TR>||is;
-	$place .= $1;
 	chomp $place;
 
 	$content =~ s|.*?<TR>(?:\s*<[^>]+>)*\s*([^<]+)\s<.*?</TR>||is;
@@ -72,7 +70,8 @@ sub queryText {
 
 	$content =~ s|.*?conditions at.*?</TD>||is;
 
-	$content =~ s|.*?<OPTION SELECTED>\s+([^<]+)\s<OPTION>.*?</TR>||s;
+	#$content =~ s|.*?<OPTION SELECTED>\s+([^<]+)\s<OPTION>.*?</TR>||s; # local time
+	$content =~ s|.*?<BR>\s+([^<]+?)\s*</FORM>.*?</TR>||s; # UTC
 	my $time = $1;
 	$time =~ s/-//g;
 	$time =~ s/\s+/ /g;