FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

59_Twilight.pm: correction when getting a timeout to the weather server parsing undefined xml string.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6905 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dietmar63 2014-11-06 20:35:21 +00:00
parent ac7827883e
commit c561b1a06e
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fhem/FHEM/59_Twilight.pm
View File

@ -432,23 +432,27 @@ sub Twilight_getWeatherHorizon($)
my $xml = GetFileFromURL($url, 3, undef, 1);
my $current, my $cond, my $temp, my $aktTemp;
if($xml=~/text="(.*)"(\ *)code="(.*)"(\ *)temp="(.*)"(\ *)date/){
if(defined($1)){
$cond =$1;
$current=$3;
$temp =$5;
}else{
$current=-1;
}
if (defined($xml)) {
if($xml=~/text="(.*)"(\ *)code="(.*)"(\ *)temp="(.*)"(\ *)date/){
if(defined($1)){
$cond =$1;
$current=$3;
$temp =$5;
}else{
$current=-1;
}
}
}else{
$current=-1;
}
if(($current>=0) && ($current <=47)) {
$hash->{WEATHER_CORRECTION} = $a_current[$current] / 25 * 20;
$hash->{WEATHER_HORIZON} = $hash->{WEATHER_CORRECTION} + $hash->{INDOOR_HORIZON};
$hash->{CONDITION_TXT} = $cond;
$hash->{CONDITION} = $current;
$hash->{TEMPERATUR} = $temp;
return 1;
}
if(($current>=0) && ($current <=47)) {
$hash->{WEATHER_CORRECTION} = $a_current[$current] / 25 * 20;
$hash->{WEATHER_HORIZON} = $hash->{WEATHER_CORRECTION} + $hash->{INDOOR_HORIZON};
$hash->{CONDITION_TXT} = $cond;
$hash->{CONDITION} = $current;
$hash->{TEMPERATUR} = $temp;
return 1;
}
Log3 $hash, 3, "[$hash->{NAME}] "