Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

77_UWZ: Code change

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@21828 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-05-01 13:44:19 +00:00
parent 9942c8ac34
commit ac12b5517c
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
FHEM/77_UWZ.pm
View File

@ -531,8 +531,8 @@ sub Initialize {
################################### ###################################
sub Define { sub Define {
my $hash = shift; my $hash = shift // return;
my $a = shift; my $aArg = shift // return;
return $@ unless ( FHEM::Meta::SetInternals($hash) ); return $@ unless ( FHEM::Meta::SetInternals($hash) );
use version 0.60; our $VERSION = FHEM::Meta::Get( $hash, 'version' ); use version 0.60; our $VERSION = FHEM::Meta::Get( $hash, 'version' );
@ -542,18 +542,18 @@ sub Define {
return return
"Wrong syntax: use define <name> UWZ <CountryCode> <PLZ> <Interval> " "Wrong syntax: use define <name> UWZ <CountryCode> <PLZ> <Interval> "
if ( scalar( @{$a} ) != 5 if ( scalar( @{$aArg} ) != 5
&& lc $a->[2] ne 'search' ); && lc $aArg->[2] ne 'search' );
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $lang = ''; my $lang = '';
$hash->{VERSION} = version->parse($VERSION)->normal; $hash->{VERSION} = version->parse($VERSION)->normal;
$hash->{NOTIFYDEV} = 'global,' . $name; $hash->{NOTIFYDEV} = 'global,' . $name;
if ( ( lc $a->[2] ) ne 'search' ) { if ( ( lc $aArg->[2] ) ne 'search' ) {
readingsSingleUpdate( $hash, 'state', 'Initializing', 1 ); readingsSingleUpdate( $hash, 'state', 'Initializing', 1 );
$hash->{CountryCode} = $a->[2]; $hash->{CountryCode} = $aArg->[2];
$hash->{PLZ} = $a->[3]; $hash->{PLZ} = $aArg->[3];
## URL by CountryCode ## URL by CountryCode
@ -572,16 +572,16 @@ sub Define {
'http://feed.alertspro.meteogroup.com/AlertsPro/AlertsProPollService.php?method=getWarning&language=' 'http://feed.alertspro.meteogroup.com/AlertsPro/AlertsProPollService.php?method=getWarning&language='
. $URL_language . $URL_language
. '&areaID=UWZ' . '&areaID=UWZ'
. $a->[2] . $aArg->[2]
. $a->[3]; . $aArg->[3];
$hash->{fhem}{LOCAL} = 0; $hash->{fhem}{LOCAL} = 0;
$hash->{INTERVAL} = $a->[4]; $hash->{INTERVAL} = $aArg->[4];
$hash->{INTERVALWARN} = 0; $hash->{INTERVALWARN} = 0;
} }
else { else {
readingsSingleUpdate( $hash, 'state', 'Search-Mode', 1 ); readingsSingleUpdate( $hash, 'state', 'Search-Mode', 1 );
$hash->{CountryCode} = uc $a->[2]; $hash->{CountryCode} = uc $aArg->[2];
} }
return; return;
@ -622,16 +622,16 @@ sub Attr {
##################################### #####################################
sub Set { sub Set {
my $hash = shift; my $hash = shift // return;
my $a = shift; my $aArg = shift // return;
my $name = shift @$a; my $name = shift @$aArg // return;
my $cmd = shift @$a // return qq{"set $name" needs at least one argument}; my $cmd = shift @$aArg // return qq{"set $name" needs at least one argument};
my $usage = "Unknown argument $cmd, choose one of update:noArg " my $usage = "Unknown argument $cmd, choose one of update:noArg "
if ( ( lc $hash->{CountryCode} ) ne 'search' ); if ( ( lc $hash->{CountryCode} ) ne 'search' );
return $usage if ( scalar( @{$a} ) != 0 ); return $usage if ( scalar( @{$aArg} ) != 0 );
given ($cmd) { given ($cmd) {
when ("?") { when ("?") {
@ -698,17 +698,17 @@ sub Notify {
} }
sub Get { sub Get {
my $hash = shift; my $hash = shift // return;
my $a = shift; my $aArg = shift // return;
my $name = shift @$a; my $name = shift @$aArg // return;
my $cmd = shift @$a // return qq{"get $name" needs at least one argument}; my $cmd = shift @$aArg // return qq{"get $name" needs at least one argument};
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) {
my $usage = my $usage =
"Unknown argument $cmd, choose one of Sturm:noArg Schneefall:noArg Regen:noArg Extremfrost:noArg Waldbrand:noArg Gewitter:noArg Glaette:noArg Hitze:noArg Glatteisregen:noArg Bodenfrost:noArg Hagel:noArg "; "Unknown argument $cmd, choose one of Sturm:noArg Schneefall:noArg Regen:noArg Extremfrost:noArg Waldbrand:noArg Gewitter:noArg Glaette:noArg Hitze:noArg Glatteisregen:noArg Bodenfrost:noArg Hagel:noArg ";
return $usage if ( scalar( @{$a} ) != 0 ); return $usage if ( scalar( @{$aArg} ) != 0 );
return return
$cmd =~ m{\ASturm}xms ? GetCurrent( $hash, 2 ) $cmd =~ m{\ASturm}xms ? GetCurrent( $hash, 2 )
@ -729,7 +729,7 @@ sub Get {
my $usage = my $usage =
"Unknown argument $cmd, choose one of storm:noArg sneeuw:noArg regen:noArg strenge-vorst:noArg bosbrand:noArg onweer:noArg gladheid:noArg hitte:noArg ijzel:noArg grondvorst:noArg hagel:noArg "; "Unknown argument $cmd, choose one of storm:noArg sneeuw:noArg regen:noArg strenge-vorst:noArg bosbrand:noArg onweer:noArg gladheid:noArg hitte:noArg ijzel:noArg grondvorst:noArg hagel:noArg ";
return $usage if ( scalar( @{$a} ) != 0 ); return $usage if ( scalar( @{$aArg} ) != 0 );
return return
$cmd =~ m{\Astorm}xms ? GetCurrent( $hash, 2 ) $cmd =~ m{\Astorm}xms ? GetCurrent( $hash, 2 )
@ -750,7 +750,7 @@ sub Get {
my $usage = my $usage =
"Unknown argument $cmd, choose one of tempete:noArg neige:noArg pluie:noArg strenge-vorst:noArg incendie-de-foret:noArg orage:noArg glissange:noArg canicule:noArg verglas:noArg grondvorst:noArg grele:noArg "; "Unknown argument $cmd, choose one of tempete:noArg neige:noArg pluie:noArg strenge-vorst:noArg incendie-de-foret:noArg orage:noArg glissange:noArg canicule:noArg verglas:noArg grondvorst:noArg grele:noArg ";
return $usage if ( scalar( @{$a} ) != 0 ); return $usage if ( scalar( @{$aArg} ) != 0 );
return return
$cmd =~ m{\Atempete}xms ? GetCurrent( $hash, 2 ) $cmd =~ m{\Atempete}xms ? GetCurrent( $hash, 2 )
@ -770,11 +770,11 @@ sub Get {
elsif ( ( lc $hash->{CountryCode} ) eq 'search' ) { elsif ( ( lc $hash->{CountryCode} ) eq 'search' ) {
my $usage = "Unknown argument $cmd, choose one of SearchAreaID "; my $usage = "Unknown argument $cmd, choose one of SearchAreaID ";
return $usage if ( scalar( @{$a} ) != 1 ); return $usage if ( scalar( @{$aArg} ) != 1 );
if ( $cmd =~ m{\ASearchAreaID}xms ) { UWZSearchLatLon( $name, $a->[0] ); } if ( $cmd =~ m{\ASearchAreaID}xms ) { UWZSearchLatLon( $name, $aArg->[0] ); }
elsif ( $cmd =~ m{\AAreaID}xms ) { elsif ( $cmd =~ m{\AAreaID}xms ) {
my @splitparam = split( /,/, $a->[0] ); my @splitparam = split( /,/, $aArg->[0] );
UWZSearchAreaID( $splitparam[0], $splitparam[1] ); UWZSearchAreaID( $splitparam[0], $splitparam[1] );
} }
else { return $usage; } else { return $usage; }
@ -784,7 +784,7 @@ sub Get {
my $usage = my $usage =
"Unknown argument $cmd, choose one of storm:noArg snow:noArg rain:noArg extremfrost:noArg forest-fire:noArg thunderstorms:noArg glaze:noArg heat:noArg glazed-rain:noArg soil-frost:noArg hail:noArg "; "Unknown argument $cmd, choose one of storm:noArg snow:noArg rain:noArg extremfrost:noArg forest-fire:noArg thunderstorms:noArg glaze:noArg heat:noArg glazed-rain:noArg soil-frost:noArg hail:noArg ";
return $usage if ( scalar( @{$a} ) != 0 ); return $usage if ( scalar( @{$aArg} ) != 0 );
return return
$cmd =~ m{\Astorm}xms ? GetCurrent( $hash, 2 ) $cmd =~ m{\Astorm}xms ? GetCurrent( $hash, 2 )