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

Compare commits

base: FHEM:e25ded22b94e0f36a1557a5cfd7da53272fafdec
Branches Tags
FHEM:dev FHEM:main
..
compare: FHEM:fa9817885c6600f2dce0cb59a4979f38833b1d2f
Branches Tags
FHEM:dev FHEM:main

3 Commits
e25ded22b9 ... fa9817885c

Author SHA1 Message Date
Marko Oldenburg
fa9817885c Merge pull request 'patch-remove-experimental' (#3) from patch-remove-experimental into dev 
Reviewed-on: #3
 2025-10-14 03:33:33 +00:00
Marko Oldenburg
7dae759870 Update copyright information and contributors list 
Improved the copyright year for the maintainer Marko Oldenburg in
the 77_UWZ.pm file to reflect the current year (2025). This ensures
the file remains up-to-date with regards to authorship.

Additionally, a new contributor, betateilchen, has been added to
the special thanks section for their contribution related to
removing experimental Perl code. Updating the contributors list
acknowledges their efforts in improving the codebase.

No other functional changes were made to the code, and there are
no breaking changes associated with this update.
 2025-10-14 04:54:53 +02:00
Marko Oldenburg
a469315070 Refactor language handling and cleanup in 77_UWZ.pm 
This commit includes several improvements and refactoring to the
77_UWZ.pm file. The primary changes involve unifying language
handling by replacing direct comparisons of the country code with
a call to a new utility function, `contains_string`, which checks
if the `CountryCode` exists within an array. This change enhances
the readability and maintainability of the code.

Additionally, certain code cleanup has been performed, including
minor formatting adjustments for better alignment and spacing,
removing deprecated warning pragmas, and correcting the 'Mäy'
month name spelling in the English months array.

These changes do not introduce any breaking changes, but they
improve the overall structure and consistency of the code, making
future modifications and updates easier.
 2025-10-14 04:50:00 +02:00
1 changed files with 118 additions and 105 deletions
Expand all files Collapse all files

223
77_UWZ.pm
View File

@@ -3,13 +3,14 @@
# 77_UWZ.pm # 77_UWZ.pm
# #
# (c) 2015-2016 Tobias D. Oestreicher # (c) 2015-2016 Tobias D. Oestreicher
# (c) 2017-2021 Marko Oldenburg # (c) 2017-2025 Marko Oldenburg
# #
# Special thanks goes to comitters: # Special thanks goes to comitters:
# - Marko Oldenburg (fhemdevelopment at cooltux dot net) # - Marko Oldenburg (fhemdevelopment at cooltux dot net)
# - Hanjo (Forum) patch for sort by creation # - Hanjo (Forum) patch for sort by creation
# - cb1 <kontakt@it-buchinger.de> patch Replace Iconv with native perl encode() # - cb1 <kontakt@it-buchinger.de> patch Replace Iconv with native perl encode()
# - KölnSolar (Markus) new write UWZAsHtml with smaler Code # - KölnSolar (Markus) new write UWZAsHtml with smaler Code
# - betateilchen (Forum) patch remove experimental perl code
# #
# Storm warnings from unwetterzentrale.de # Storm warnings from unwetterzentrale.de
# inspired by 59_PROPLANTA.pm # inspired by 59_PROPLANTA.pm
@@ -55,8 +56,7 @@ use Encode qw(encode_utf8);
no no
if $] >= 5.017011, if $] >= 5.017011,
warnings => 'experimental::lexical_subs', warnings => 'experimental::lexical_subs';
'experimental::smartmatch';
my $missingModul; my $missingModul;
eval 'use LWP::UserAgent;1' or $missingModul .= 'LWP::UserAgent '; eval 'use LWP::UserAgent;1' or $missingModul .= 'LWP::UserAgent ';
@@ -170,7 +170,8 @@ BEGIN {
init_done init_done
FW_httpheader FW_httpheader
HttpUtils_BlockingGet HttpUtils_BlockingGet
deviceEvents) deviceEvents
contains_string)
); );
} }
@@ -182,13 +183,13 @@ GP_Export(
Run Run
Aborted Aborted
Done Done
) )
); );
my @DEweekdays = my @DEweekdays =
qw(Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag); qw(Sonntag Montag Dienstag Mittwoch Donnerstag Freitag Samstag);
my @DEmonths = ( my @DEmonths = (
'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni',
'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember' 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'
); );
my @NLweekdays = qw(zondag maandag dinsdag woensdag donderdag vrijdag zaterdag); my @NLweekdays = qw(zondag maandag dinsdag woensdag donderdag vrijdag zaterdag);
@@ -203,7 +204,7 @@ my @FRmonths = (
); );
my @ENweekdays = qw(sunday monday thuesday wednesday thursday friday saturday); my @ENweekdays = qw(sunday monday thuesday wednesday thursday friday saturday);
my @ENmonths = ( my @ENmonths = (
'January', 'February', 'March', 'April', 'Mäy', 'June', 'January', 'February', 'March', 'April', 'Mäy', 'June',
'July', 'August', 'September', 'October', 'November', 'December' 'July', 'August', 'September', 'October', 'November', 'December'
); );
@@ -221,7 +222,7 @@ sub Log {
my $xline = ( caller(0) )[2]; my $xline = ( caller(0) )[2];
my $xsubroutine = ( caller(1) )[3]; my $xsubroutine = ( caller(1) )[3];
my $sub = ( split( ':', $xsubroutine ) )[2]; my $sub = ( split( ':', $xsubroutine ) )[2];
$sub =~ s/UWZ_//; $sub =~ s/UWZ_//;
my $instName = ( ref($hash) eq 'HASH' ) ? $hash->{NAME} : $hash; my $instName = ( ref($hash) eq 'HASH' ) ? $hash->{NAME} : $hash;
@@ -558,13 +559,13 @@ sub Define {
## URL by CountryCode ## URL by CountryCode
my $URL_language = 'en'; my $URL_language = 'en';
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if ( contains_string( $hash->{CountryCode}, ( 'DE', 'AT', 'CH' ) ) ) {
$URL_language = 'de'; $URL_language = 'de';
} }
if ( $hash->{CountryCode} ~~ ['NL'] ) { if ( $hash->{CountryCode} eq 'NL' ) {
$URL_language = 'nl'; $URL_language = 'nl';
} }
if ( $hash->{CountryCode} ~~ ['FR'] ) { if ( $hash->{CountryCode} eq 'FR' ) {
$URL_language = 'fr'; $URL_language = 'fr';
} }
@@ -626,28 +627,22 @@ sub Set {
my $aArg = shift // return; my $aArg = shift // return;
my $name = shift @$aArg // return; my $name = shift @$aArg // return;
my $cmd = shift @$aArg // 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( @{$aArg} ) != 0 ); return $usage if ( scalar( @{$aArg} ) != 0 );
given ($cmd) { if ( $cmd eq 'update' ) {
when ("?") { Log $hash, 4, 'set command: ' . $cmd;
return $usage; $hash->{fhem}{LOCAL} = 1;
} Start($hash);
$hash->{fhem}{LOCAL} = 0;
when ('update') { }
Log $hash, 4, 'set command: ' . $cmd; else { # including $cmd eq '?'
$hash->{fhem}{LOCAL} = 1; return $usage;
Start($hash);
$hash->{fhem}{LOCAL} = 0;
}
default {
return $usage;
}
} }
return; return;
@@ -702,9 +697,10 @@ sub Get {
my $aArg = shift // return; my $aArg = shift // return;
my $name = shift @$aArg // return; my $name = shift @$aArg // return;
my $cmd = shift @$aArg // 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 ( contains_string( $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 ";
@@ -725,7 +721,7 @@ sub Get {
: $usage; : $usage;
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
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 ";
@@ -746,7 +742,7 @@ sub Get {
: $usage; : $usage;
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
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 ";
@@ -756,14 +752,14 @@ sub Get {
$cmd =~ m{\Atempete}xms ? GetCurrent( $hash, 2 ) $cmd =~ m{\Atempete}xms ? GetCurrent( $hash, 2 )
: $cmd =~ m{\Aneige}xms ? GetCurrent( $hash, 3 ) : $cmd =~ m{\Aneige}xms ? GetCurrent( $hash, 3 )
: $cmd =~ m{\Apluie}xms ? GetCurrent( $hash, 4 ) : $cmd =~ m{\Apluie}xms ? GetCurrent( $hash, 4 )
: $cmd =~ m{\Atempérature}xms ? GetCurrent( $hash, 5 ) : $cmd =~ m{\Atempérature}xms ? GetCurrent( $hash, 5 )
: $cmd =~ m{\Afeu-de-forêt}xms ? GetCurrent( $hash, 6 ) : $cmd =~ m{\Afeu-de-forêt}xms ? GetCurrent( $hash, 6 )
: $cmd =~ m{\Aorage}xms ? GetCurrent( $hash, 7 ) : $cmd =~ m{\Aorage}xms ? GetCurrent( $hash, 7 )
: $cmd =~ m{\Aoute-glissante}xms ? GetCurrent( $hash, 8 ) : $cmd =~ m{\Aoute-glissante}xms ? GetCurrent( $hash, 8 )
: $cmd =~ m{\Achaleur}xms ? GetCurrent( $hash, 9 ) : $cmd =~ m{\Achaleur}xms ? GetCurrent( $hash, 9 )
: $cmd =~ m{\Apluie-de-verglas}xms ? GetCurrent( $hash, 10 ) : $cmd =~ m{\Apluie-de-verglas}xms ? GetCurrent( $hash, 10 )
: $cmd =~ m{\Agelée}xms ? GetCurrent( $hash, 11 ) : $cmd =~ m{\Agelée}xms ? GetCurrent( $hash, 11 )
: $cmd =~ m{\Agrêle}xms ? GetCurrentHail($hash) : $cmd =~ m{\Agrêle}xms ? GetCurrentHail($hash)
: $usage; : $usage;
} }
@@ -772,7 +768,9 @@ sub Get {
return $usage if ( scalar( @{$aArg} ) != 1 ); return $usage if ( scalar( @{$aArg} ) != 1 );
if ( $cmd =~ m{\ASearchAreaID}xms ) { UWZSearchLatLon( $name, $aArg->[0] ); } if ( $cmd =~ m{\ASearchAreaID}xms ) {
UWZSearchLatLon( $name, $aArg->[0] );
}
elsif ( $cmd =~ m{\AAreaID}xms ) { elsif ( $cmd =~ m{\AAreaID}xms ) {
my @splitparam = split( /,/, $aArg->[0] ); my @splitparam = split( /,/, $aArg->[0] );
UWZSearchAreaID( $splitparam[0], $splitparam[1] ); UWZSearchAreaID( $splitparam[0], $splitparam[1] );
@@ -932,13 +930,13 @@ sub Start {
$URL_language = AttrVal( $hash->{NAME}, 'lang', '' ); $URL_language = AttrVal( $hash->{NAME}, 'lang', '' );
} }
else { else {
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if ( contains_string( $hash->{CountryCode}, ( 'DE', 'AT', 'CH' ) ) ) {
$URL_language = 'de'; $URL_language = 'de';
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
$URL_language = 'nl'; $URL_language = 'nl';
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
$URL_language = 'fr'; $URL_language = 'fr';
} }
} }
@@ -1022,12 +1020,17 @@ sub Done {
# Message by CountryCode # Message by CountryCode
$newState = 'Warnings: ' . $values{WarnCount}; $newState = 'Warnings: ' . $values{WarnCount};
$newState = 'Warnungen: ' . $values{WarnCount} $newState = 'Warnungen: '
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ); . $values{WarnCount}
if (
contains_string(
$hash->{CountryCode}, ( 'DE', 'AT', 'CH' )
)
);
$newState = 'Aantal waarschuwingen: ' . $values{WarnCount} $newState = 'Aantal waarschuwingen: ' . $values{WarnCount}
if ( $hash->{CountryCode} ~~ ['NL'] ); if ( $hash->{CountryCode} eq 'NL' );
$newState = 'Avertissements: ' . $values{WarnCount} $newState = 'Avertissements: ' . $values{WarnCount}
if ( $hash->{CountryCode} ~~ ['FR'] ); if ( $hash->{CountryCode} eq 'FR' );
# end Message by CountryCode # end Message by CountryCode
} }
@@ -1085,7 +1088,7 @@ sub Run {
my $readingStartTime = time(); my $readingStartTime = time();
my $attrdownload = AttrVal( $name, 'download', '' ); my $attrdownload = AttrVal( $name, 'download', '' );
my $attrsavepath = AttrVal( $name, 'savepath', '' ); my $attrsavepath = AttrVal( $name, 'savepath', '' );
my $maps2fetch = AttrVal( $name, 'maps', '' ); my $maps2fetch = AttrVal( $name, 'maps', '' );
## begin redundant Reading switch ## begin redundant Reading switch
my $attrhumanreadable = AttrVal( $name, 'humanreadable', '' ); my $attrhumanreadable = AttrVal( $name, 'humanreadable', '' );
@@ -1124,7 +1127,7 @@ sub Run {
if ( $UWZ_download == 1 ) { if ( $UWZ_download == 1 ) {
if ( !defined($maps2fetch) ) { $maps2fetch = 'deutschland'; } if ( !defined($maps2fetch) ) { $maps2fetch = 'deutschland'; }
Log $hash, 4, 'Maps2Fetch : ' . $maps2fetch; Log $hash, 4, 'Maps2Fetch : ' . $maps2fetch;
my @maps = split( ' ', $maps2fetch ); my @maps = split( ' ', $maps2fetch );
my $uwz_de_url = 'https://www.unwetterzentrale.de/images/map/'; my $uwz_de_url = 'https://www.unwetterzentrale.de/images/map/';
foreach my $smap (@maps) { foreach my $smap (@maps) {
@@ -1259,15 +1262,15 @@ sub Run {
my %severitycolor = ( my %severitycolor = (
'0' => 'green', '0' => 'green',
'1' => 'unknown', # <===== FIX HERE '1' => 'unknown', # <===== FIX HERE
'2' => 'unknown', # <===== FIX HERE '2' => 'unknown', # <===== FIX HERE
'3' => 'unknown', # <===== FIX HERE '3' => 'unknown', # <===== FIX HERE
'4' => 'orange', '4' => 'orange',
'5' => 'unknown', # <===== FIX HERE '5' => 'unknown', # <===== FIX HERE
'6' => 'unknown', # <===== FIX HERE '6' => 'unknown', # <===== FIX HERE
'7' => 'orange', '7' => 'orange',
'8' => 'gelb', '8' => 'gelb',
'9' => 'gelb', # <===== FIX HERE '9' => 'gelb', # <===== FIX HERE
'10' => 'orange', '10' => 'orange',
'11' => 'rot', '11' => 'rot',
'12' => 'violett' '12' => 'violett'
@@ -1335,8 +1338,7 @@ sub Run {
. $i . $i
. '_Start_Date|' . '_Start_Date|'
. strftime( "%d.%m.%Y", . strftime( "%d.%m.%Y",
localtime( $single_warning->{'dtgStart'} ) ) localtime( $single_warning->{'dtgStart'} ) ) . '|';
. '|';
Log $hash, 4, Log $hash, 4,
'Warn_' 'Warn_'
@@ -1348,8 +1350,7 @@ sub Run {
. $i . $i
. '_Start_Time|' . '_Start_Time|'
. strftime( "%H:%M", . strftime( "%H:%M",
localtime( $single_warning->{'dtgStart'} ) ) localtime( $single_warning->{'dtgStart'} ) ) . '|';
. '|';
Log $hash, 4, Log $hash, 4,
'Warn_' 'Warn_'
@@ -1361,8 +1362,7 @@ sub Run {
. $i . $i
. '_End_Date|' . '_End_Date|'
. strftime( "%d.%m.%Y", . strftime( "%d.%m.%Y",
localtime( $single_warning->{'dtgEnd'} ) ) localtime( $single_warning->{'dtgEnd'} ) ) . '|';
. '|';
Log $hash, 4, Log $hash, 4,
'Warn_' 'Warn_'
@@ -1374,8 +1374,7 @@ sub Run {
. $i . $i
. '_End_Time|' . '_End_Time|'
. strftime( "%H:%M", . strftime( "%H:%M",
localtime( $single_warning->{'dtgEnd'} ) ) localtime( $single_warning->{'dtgEnd'} ) ) . '|';
. '|';
Log $hash, 4, Log $hash, 4,
'Warn_' 'Warn_'
@@ -1398,7 +1397,12 @@ sub Run {
. strftime( "%H:%M", localtime($chopcreation) ) . '|'; . strftime( "%H:%M", localtime($chopcreation) ) . '|';
# Begin Language by AttrVal # Begin Language by AttrVal
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if (
contains_string(
$hash->{CountryCode}, ( 'DE', 'AT', 'CH' )
)
)
{
Log $hash, 4, Log $hash, 4,
'Warn_' 'Warn_'
. $i . $i
@@ -1430,11 +1434,10 @@ sub Run {
. $uwzlevelname{ . $uwzlevelname{
GetUWZLevel( $hash, GetUWZLevel( $hash,
$single_warning->{'payload'}{'levelName'} ) $single_warning->{'payload'}{'levelName'} )
} } . '|';
. '|';
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
Log $hash, 4, Log $hash, 4,
'Warn_' 'Warn_'
. $i . $i
@@ -1469,11 +1472,10 @@ sub Run {
. $uwzlevelname{ . $uwzlevelname{
GetUWZLevel( $hash, GetUWZLevel( $hash,
$single_warning->{'payload'}{'levelName'} ) $single_warning->{'payload'}{'levelName'} )
} } . '|';
. '|';
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
Log $hash, 4, Log $hash, 4,
'Warn_' 'Warn_'
. $i . $i
@@ -1505,8 +1507,7 @@ sub Run {
. $uwzlevelname{ . $uwzlevelname{
GetUWZLevel( $hash, GetUWZLevel( $hash,
$single_warning->{'payload'}{'levelName'} ) $single_warning->{'payload'}{'levelName'} )
} } . '|';
. '|';
} }
else { else {
@@ -1541,8 +1542,7 @@ sub Run {
. $uwzlevelname{ . $uwzlevelname{
GetUWZLevel( $hash, GetUWZLevel( $hash,
$single_warning->{'payload'}{'levelName'} ) $single_warning->{'payload'}{'levelName'} )
} } . '|';
. '|';
} }
@@ -1591,13 +1591,18 @@ sub Run {
} }
else { else {
# Begin Language by AttrVal # Begin Language by AttrVal
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if (
contains_string(
$hash->{CountryCode}, ( 'DE', 'AT', 'CH' )
)
)
{
$uclang = 'DE'; $uclang = 'DE';
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
$uclang = 'NL'; $uclang = 'NL';
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
$uclang = 'FR'; $uclang = 'FR';
} }
else { else {
@@ -1690,21 +1695,22 @@ sub Run {
# Begin Language by AttrVal # Begin Language by AttrVal
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if ( contains_string( $hash->{CountryCode}, ( 'DE', 'AT', 'CH' ) ) )
{
$hagelcount = my @hagelmatch = $hagelcount = my @hagelmatch =
$single_warning->{'payload'}{'translationsLongText'}{'DE'} =~ $single_warning->{'payload'}{'translationsLongText'}{'DE'} =~
/Hagel/g; /Hagel/g;
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
$hagelcount = my @hagelmatch = $hagelcount = my @hagelmatch =
$single_warning->{'payload'}{'translationsLongText'}{'NL'} =~ $single_warning->{'payload'}{'translationsLongText'}{'NL'} =~
/hagel/g; /hagel/g;
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
$hagelcount = my @hagelmatch = $hagelcount = my @hagelmatch =
$single_warning->{'payload'}{'translationsLongText'}{'FR'} =~ $single_warning->{'payload'}{'translationsLongText'}{'FR'} =~
@@ -1749,7 +1755,8 @@ sub Run {
## Begin of redundant Reading ## Begin of redundant Reading
if ( $UWZ_humanreadable eq 1 ) { if ( $UWZ_humanreadable eq 1 ) {
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if ( contains_string( $hash->{CountryCode}, ( 'DE', 'AT', 'CH' ) ) )
{
my %uwzlevelname = ( my %uwzlevelname = (
'0' => 'Stufe Grün (keine Warnung)', '0' => 'Stufe Grün (keine Warnung)',
'1' => 'Stufe Dunkelgrün (Wetterhinweise)', '1' => 'Stufe Dunkelgrün (Wetterhinweise)',
@@ -1762,7 +1769,7 @@ sub Run {
$message .= 'WarnUWZLevel_Str|' . $uwzlevelname{$max} . '|'; $message .= 'WarnUWZLevel_Str|' . $uwzlevelname{$max} . '|';
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
my %uwzlevelname = ( my %uwzlevelname = (
'0' => 'niveau groen (geen waarschuwingen)', '0' => 'niveau groen (geen waarschuwingen)',
'1' => 'niveau donkergroen (voorwaarschuwing)', '1' => 'niveau donkergroen (voorwaarschuwing)',
@@ -1778,7 +1785,7 @@ sub Run {
$message .= 'WarnUWZLevel_Str|' . $uwzlevelname{$max} . '|'; $message .= 'WarnUWZLevel_Str|' . $uwzlevelname{$max} . '|';
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
my %uwzlevelname = ( my %uwzlevelname = (
'0' => 'niveau vert (aucune alerte)', '0' => 'niveau vert (aucune alerte)',
'1' => 'niveau vert foncé (indication météo)', '1' => 'niveau vert foncé (indication météo)',
@@ -1863,7 +1870,11 @@ sub UWZAsHtml {
} }
} }
else { else {
for ( my $i = 0 ; $i < ReadingsVal( $name, 'WarnCount', 0 ) ; $i++ ) for (
my $i = 0 ;
$i < ReadingsVal( $name, 'WarnCount', 0 ) ;
$i++
)
{ {
$ret .= UWZHtmlFrame( $hash, 'Warn_' . $i, $attr, 1 ); $ret .= UWZHtmlFrame( $hash, 'Warn_' . $i, $attr, 1 );
@@ -1887,13 +1898,13 @@ sub UWZAsHtml {
$ret .= '<tr><td class="uwzIcon" style="vertical-align:top;">'; $ret .= '<tr><td class="uwzIcon" style="vertical-align:top;">';
# language by AttrVal # language by AttrVal
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if ( contains_string( $hash->{CountryCode}, ( 'DE', 'AT', 'CH' ) ) ) {
$ret .= '<b>Keine Warnungen</b>'; $ret .= '<b>Keine Warnungen</b>';
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
$ret .= '<b>Geen waarschuwingen</b>'; $ret .= '<b>Geen waarschuwingen</b>';
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
$ret .= '<b>Aucune alerte</b>'; $ret .= '<b>Aucune alerte</b>';
} }
else { else {
@@ -1916,8 +1927,8 @@ sub UWZAsHtmlLite {
my $ret = ''; my $ret = '';
my $hash = $defs{$name}; my $hash = $defs{$name};
my $htmlsequence = AttrVal( $name, 'htmlsequence', 'none' ); my $htmlsequence = AttrVal( $name, 'htmlsequence', 'none' );
my $htmltitle = AttrVal( $name, 'htmltitle', '' ); my $htmltitle = AttrVal( $name, 'htmltitle', '' );
my $htmltitleclass = AttrVal( $name, 'htmltitleclass', '' ); my $htmltitleclass = AttrVal( $name, 'htmltitleclass', '' );
my $attr; my $attr;
@@ -1951,8 +1962,11 @@ sub UWZAsHtmlLite {
} }
} }
else { else {
for ( my $i = 0 ; for (
$i < ReadingsVal( $name, 'WarnCount', '' ) ; $i++ ) my $i = 0 ;
$i < ReadingsVal( $name, 'WarnCount', '' ) ;
$i++
)
{ {
$ret .= UWZHtmlFrame( $hash, 'Warn_' . $i, $attr, 0 ); $ret .= UWZHtmlFrame( $hash, 'Warn_' . $i, $attr, 0 );
} }
@@ -1974,13 +1988,13 @@ sub UWZAsHtmlLite {
$ret .= '<tr><td class="uwzIcon" style="vertical-align:top;">'; $ret .= '<tr><td class="uwzIcon" style="vertical-align:top;">';
# language by AttrVal # language by AttrVal
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if ( contains_string( $hash->{CountryCode}, ( 'DE', 'AT', 'CH' ) ) ) {
$ret .= '<b>Keine Warnungen</b>'; $ret .= '<b>Keine Warnungen</b>';
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
$ret .= '<b>Geen waarschuwingen</b>'; $ret .= '<b>Geen waarschuwingen</b>';
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
$ret .= '<b>Aucune alerte</b>'; $ret .= '<b>Aucune alerte</b>';
} }
else { else {
@@ -2001,7 +2015,7 @@ sub UWZAsHtmlLite {
sub UWZAsHtmlFP { sub UWZAsHtmlFP {
my $name = shift; my $name = shift;
my $tablewidth = ReadingsVal( $name, 'WarnCount', '' ) * 80; my $tablewidth = ReadingsVal( $name, 'WarnCount', '' ) * 80;
my $htmlsequence = AttrVal( $name, 'htmlsequence', 'none' ); my $htmlsequence = AttrVal( $name, 'htmlsequence', 'none' );
my $htmltitle = AttrVal( $name, 'htmltitle', '' ); my $htmltitle = AttrVal( $name, 'htmltitle', '' );
my $htmltitleclass = AttrVal( $name, 'htmltitleclass', '' ); my $htmltitleclass = AttrVal( $name, 'htmltitleclass', '' );
@@ -2066,13 +2080,13 @@ sub UWZAsHtmlMovie {
} }
else { else {
# language by AttrVal # language by AttrVal
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if ( contains_string( $hash->{CountryCode}, ( 'DE', 'AT', 'CH' ) ) ) {
$ret .= 'unbekannte Landbezeichnung'; $ret .= 'unbekannte Landbezeichnung';
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
$ret .= 'Onbekende landcode'; $ret .= 'Onbekende landcode';
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
$ret .= 'code de pays inconnu'; $ret .= 'code de pays inconnu';
} }
else { else {
@@ -2107,13 +2121,13 @@ sub UWZAsHtmlKarteLand {
} }
else { else {
# language by AttrVal # language by AttrVal
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if ( contains_string( $hash->{CountryCode}, ( 'DE', 'AT', 'CH' ) ) ) {
$ret .= 'unbekannte Landbezeichnung'; $ret .= 'unbekannte Landbezeichnung';
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
$ret .= 'onbekende landcode'; $ret .= 'onbekende landcode';
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
$ret .= 'code de pays inconnu'; $ret .= 'code de pays inconnu';
} }
else { else {
@@ -2183,7 +2197,7 @@ sub UWZHtmlTimestamp {
if ( length($min) == 1 ) { $min = "0$min"; } if ( length($min) == 1 ) { $min = "0$min"; }
# language by AttrVal # language by AttrVal
if ( $hash->{CountryCode} ~~ [ 'DE', 'AT', 'CH' ] ) { if ( contains_string( $hash->{CountryCode}, ( 'DE', 'AT', 'CH' ) ) ) {
$ret .= $ret .=
"<td><b>$DEText[$StartEnd]</b></td><td>" "<td><b>$DEText[$StartEnd]</b></td><td>"
. "$DEweekdays[$wday], $mday $DEmonths[$mon] " . "$DEweekdays[$wday], $mday $DEmonths[$mon] "
@@ -2191,7 +2205,7 @@ sub UWZHtmlTimestamp {
. " $hour:$min " . " $hour:$min "
. "$DEText[2]</td>"; . "$DEText[2]</td>";
} }
elsif ( $hash->{CountryCode} ~~ ['NL'] ) { elsif ( $hash->{CountryCode} eq 'NL' ) {
$ret .= $ret .=
"<td><b>$NLText[$StartEnd]</b></td><td>" "<td><b>$NLText[$StartEnd]</b></td><td>"
. "$NLweekdays[$wday], $mday $NLmonths[$mon] " . "$NLweekdays[$wday], $mday $NLmonths[$mon] "
@@ -2199,7 +2213,7 @@ sub UWZHtmlTimestamp {
. " $hour:$min " . " $hour:$min "
. "$NLText[2]</td>"; . "$NLText[2]</td>";
} }
elsif ( $hash->{CountryCode} ~~ ['FR'] ) { elsif ( $hash->{CountryCode} eq 'FR' ) {
$ret .= $ret .=
"<td><b>$FRText[$StartEnd]</b></td><td>" "<td><b>$FRText[$StartEnd]</b></td><td>"
. "$FRweekdays[$wday], $mday $FRmonths[$mon] " . "$FRweekdays[$wday], $mday $FRmonths[$mon] "
@@ -2330,7 +2344,7 @@ sub UWZSearchLatLon {
protocols_allowed => ['http'], protocols_allowed => ['http'],
timeout => 10 timeout => 10
); );
my $request = HTTP::Request->new( GET => $url ); my $request = HTTP::Request->new( GET => $url );
my $response = $agent->request($request); my $response = $agent->request($request);
$err_log = 'Can\'t get ' . $url . ' -- ' . $response->status_line $err_log = 'Can\'t get ' . $url . ' -- ' . $response->status_line
if ( !$response->is_success ); if ( !$response->is_success );
@@ -2340,7 +2354,7 @@ sub UWZSearchLatLon {
} }
use XML::Simple qw(:strict); use XML::Simple qw(:strict);
use Encode qw(decode encode); use Encode qw(decode encode);
my $uwzxmlparser = XML::Simple->new(); my $uwzxmlparser = XML::Simple->new();
my $search = $uwzxmlparser->XMLin( my $search = $uwzxmlparser->XMLin(
@@ -2378,8 +2392,7 @@ sub UWZSearchLatLon {
'<a href="/fhem?cmd=get%20' '<a href="/fhem?cmd=get%20'
. $name . $name
. '%20AreaID%20' . '%20AreaID%20'
. $value->{'latitude'} . $value->{'latitude'} . ','
. ','
. $value->{'longitude'} . $value->{'longitude'}
. $::FW_CSRF . $::FW_CSRF
. '">Get AreaID</a>'; . '">Get AreaID</a>';
@@ -2412,7 +2425,7 @@ sub UWZSearchAreaID {
protocols_allowed => ['http'], protocols_allowed => ['http'],
timeout => 10 timeout => 10
); );
my $request = HTTP::Request->new( GET => $url ); my $request = HTTP::Request->new( GET => $url );
my $response = $agent->request($request); my $response = $agent->request($request);
$err_log = "Can't get $url -- " . $response->status_line $err_log = "Can't get $url -- " . $response->status_line
if ( !$response->is_success ); if ( !$response->is_success );