Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

UConv.pm: fix undef parameters

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21159 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2020-02-09 14:04:27 +00:00
parent 752949f722
commit d7acb84e56
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/FHEM/UConv.pm
View File

@ -783,7 +783,7 @@ sub mi2km($;$) {
sub direction2compasspoint($;$$) { sub direction2compasspoint($;$$) {
my ( $deg, $txt, $lang ) = @_; my ( $deg, $txt, $lang ) = @_;
my $i = floor( ( ( $deg + 11.25 ) % 360 ) / 22.5 ); my $i = floor( ( ( $deg + 11.25 ) % 360 ) / 22.5 );
return $i if ( !wantarray && defined($txt) && $txt == 0. ); return $i if ( !wantarray && defined($txt) && $txt == "0" );
my $directions_txt_i18n; my $directions_txt_i18n;
$lang = main::AttrVal( "global", "language", "EN" ) unless ($lang); $lang = main::AttrVal( "global", "language", "EN" ) unless ($lang);
@ -800,8 +800,8 @@ sub direction2compasspoint($;$$) {
$directions_txt_i18n->[$i][1], $directions_txt_i18n->[$i][1],
encode_utf8 $directions_txt_i18n->[$i][2] encode_utf8 $directions_txt_i18n->[$i][2]
) if wantarray; ) if wantarray;
return encode_utf8 $directions_txt_i18n->[$i][2] if ( $txt && $txt == 3. ); return encode_utf8 $directions_txt_i18n->[$i][2] if ( $txt && $txt eq "3" );
return encode_utf8 $directions_txt_i18n->[$i][0] if ( $txt && $txt == 2. ); return encode_utf8 $directions_txt_i18n->[$i][0] if ( $txt && $txt eq "2" );
return $directions_txt_i18n->[$i][1]; return $directions_txt_i18n->[$i][1];
} }
@ -1029,7 +1029,7 @@ sub compasspoint2compasspoint($;$$$) {
$toLang ? $toLang : $fromLang ) $toLang ? $toLang : $fromLang )
if ( $shortTxt =~ m/^\d+(?:\.\d+)?$/ ); if ( $shortTxt =~ m/^\d+(?:\.\d+)?$/ );
return compasspoint2direction( $shortTxt, $fromLang ) return compasspoint2direction( $shortTxt, $fromLang )
if ( defined($txt) && $txt == 0. ); if ( defined($txt) && $txt eq "0" );
my $fromDirections_txt_i18n; my $fromDirections_txt_i18n;
$fromLang = "EN" unless ($fromLang); $fromLang = "EN" unless ($fromLang);
@ -1073,8 +1073,8 @@ sub compasspoint2compasspoint($;$$$) {
unless ( defined($txt) ) { unless ( defined($txt) ) {
$txt = 1; $txt = 1;
$txt = 3 if ( $i2 == 2. ); $txt = 3 if ( $i2 eq "2" );
$txt = 2 if ( $i2 == 0. ); $txt = 2 if ( $i2 eq "0" );
} }
unless ( defined($i) ) { unless ( defined($i) ) {
@ -1087,8 +1087,8 @@ sub compasspoint2compasspoint($;$$$) {
$toDirections_txt_i18n->[$i][1], $toDirections_txt_i18n->[$i][1],
encode_utf8 $toDirections_txt_i18n->[$i][2] encode_utf8 $toDirections_txt_i18n->[$i][2]
) if wantarray; ) if wantarray;
return encode_utf8 $toDirections_txt_i18n->[$i][2] if ( $txt == 3. ); return encode_utf8 $toDirections_txt_i18n->[$i][2] if ( $txt eq "3" );
return encode_utf8 $toDirections_txt_i18n->[$i][0] if ( $txt == 2. ); return encode_utf8 $toDirections_txt_i18n->[$i][0] if ( $txt eq "2" );
return $toDirections_txt_i18n->[$i][1]; return $toDirections_txt_i18n->[$i][1];
} }
@ -1139,7 +1139,7 @@ sub arabic2roman ($) {
my ($n) = @_; my ($n) = @_;
my %items = (); my %items = ();
my @r; my @r;
return "" if ( !$n || $n eq "" || $n !~ m/^\d+(?:\.\d+)?$/ || $n == 0. ); return "" if ( !$n || $n eq "" || $n !~ m/^\d+(?:\.\d+)?$/ || $n eq "0" );
return $n return $n
if ( $n >= 1000001. ); # numbers above cannot be displayed/converted if ( $n >= 1000001. ); # numbers above cannot be displayed/converted