FHEM/mod-Weather
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

fix Weather_CheckOptions func

Browse Source
This commit is contained in:
Marko Oldenburg 2022-12-20 12:53:44 +01:00
parent 9f005d050e
commit ca343e104b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
59_Weather.pm
View File

@ -895,7 +895,7 @@ sub WeatherAsHtmlV {
my $op1 = shift; my $op1 = shift;
my $op2 = shift; my $op2 = shift;
my ( $f, $items ) = WeatherCheckOptions( $d, $op1, $op2 ); my ( $f, $items ) = Weather_CheckOptions( $d, $op1, $op2 );
my $h = $defs{$d}; my $h = $defs{$d};
my $width = int( $ICONSCALE * $ICONWIDTH ); my $width = int( $ICONSCALE * $ICONWIDTH );
@ -966,7 +966,7 @@ sub WeatherAsHtml {
my $op1 = shift; my $op1 = shift;
my $op2 = shift; my $op2 = shift;
my ( $f, $items ) = WeatherCheckOptions( $d, $op1, $op2 ); my ( $f, $items ) = Weather_CheckOptions( $d, $op1, $op2 );
return WeatherAsHtmlV( $d, $f, $items ); return WeatherAsHtmlV( $d, $f, $items );
} }
@ -976,7 +976,7 @@ sub WeatherAsHtmlH {
my $op1 = shift; my $op1 = shift;
my $op2 = shift; my $op2 = shift;
my ( $f, $items ) = WeatherCheckOptions( $d, $op1, $op2 ); my ( $f, $items ) = Weather_CheckOptions( $d, $op1, $op2 );
my $h = $defs{$d}; my $h = $defs{$d};
my $width = int( $ICONSCALE * $ICONWIDTH ); my $width = int( $ICONSCALE * $ICONWIDTH );
@ -1068,7 +1068,7 @@ sub WeatherAsHtmlD {
my $op1 = shift; my $op1 = shift;
my $op2 = shift; my $op2 = shift;
my ( $f, $items ) = WeatherCheckOptions( $d, $op1, $op2 ); my ( $f, $items ) = Weather_CheckOptions( $d, $op1, $op2 );
if ($FW_ss) { if ($FW_ss) {
WeatherAsHtmlV( $d, $f, $items ); WeatherAsHtmlV( $d, $f, $items );
@ -1080,11 +1080,15 @@ sub WeatherAsHtmlD {
return; return;
} }
sub WeatherCheckOptions { sub Weather_CheckOptions {
my $d = shift; my $d = shift;
my $op1 = shift; my $op1 = shift;
my $op2 = shift; my $op2 = shift;
return "$d is not a Weather instance<br>"
if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" );
my $hash = $defs{$d};
my $items = $op2; my $items = $op2;
my $f = $op1; my $f = $op1;
@ -1096,16 +1100,12 @@ sub WeatherCheckOptions {
$items = 6 if ( !$items ); $items = 6 if ( !$items );
return "$d is not a Weather instance<br>" my $forecastConfig = Weather_ForcastConfig($hash);
if ( !$defs{$d} || $defs{$d}->{TYPE} ne "Weather" ); $f = (
$forecastConfig->{daily}
if ( AttrVal( $d, 'forecast', 'none' ) ne 'none' ) { ? 'd'
$f = ( : ( $forecastConfig->{daily} && $forecastConfig->{hourly} ? $f : 'h' )
AttrVal( $d, 'forecast', 'none' ) eq 'daily' ) if !( defined($f) and $f );
? 'd'
: ( AttrVal( $d, 'forecast', 'none' ) eq 'every' ? $f : 'h' )
);
}
$f = 'h' if ( !$f || length($f) > 1 ); $f = 'h' if ( !$f || length($f) > 1 );