From 98f21394ae32053b25e62c4a080d85241da21ae1 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Sun, 1 Mar 2020 18:23:43 +0000 Subject: [PATCH] 93_DbRep: fix PERL WARNING again git-svn-id: https://svn.fhem.de/fhem/trunk@21329 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/93_DbRep.pm | 7 ++++--- fhem/contrib/DS_Starter/57_SSCal.pm | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 95d573562..9b6014e65 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 93_DbRep: fix PERL WARNING again - bugfix: 73_WaterCalculator: NotifyDev trigger fixed: notifyRegexpChanged - bugfix: 73_GasCalculator: NotifyDev trigger fixed: notifyRegexpChanged - bugfix: 73_ElectricityCalculator: NotifyDev trigger fixed: notifyRegexpCh. diff --git a/fhem/FHEM/93_DbRep.pm b/fhem/FHEM/93_DbRep.pm index acea3e022..87bae9d54 100644 --- a/fhem/FHEM/93_DbRep.pm +++ b/fhem/FHEM/93_DbRep.pm @@ -58,6 +58,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch'; # Version History intern our %DbRep_vNotesIntern = ( + "8.32.2" => "01.03.2020 fix PERL WARNING: Argument \"\" isn't numeric in sprintf at ./FHEM/93_DbRep.pm line 10708 again ", "8.32.1" => "08.02.2020 fix PERL WARNING: Argument \"\" isn't numeric in sprintf at ./FHEM/93_DbRep.pm line 10708 ", "8.32.0" => "29.01.2020 new option \"deleteOther\" for minValue ", "8.31.0" => "26.01.2020 new option \"deleteOther\" for maxValue ", @@ -10706,7 +10707,7 @@ sub DbRep_OutputWriteToDB($$$$$) { foreach my $row (@arr) { my @a = split("#", $row); my $runtime_string = $a[0]; # Aggregations-Alias (nicht benötigt) - $value = looks_like_number($a[1])?sprintf("%.4f",$a[1]):undef; + $value = defined($a[1])?(looks_like_number($a[1])?sprintf("%.4f",$a[1]):$a[1]):undef; # Version 8.32.2 $rsf = $a[2]; # Runtime String first - Datum / Zeit für DB-Speicherung ($date,$time) = split("_",$rsf); $time =~ s/-/:/g if($time); @@ -10716,7 +10717,7 @@ sub DbRep_OutputWriteToDB($$$$$) { if($time !~ /^(\d{2}):(\d{2}):(\d{2})$/) { if($aggr =~ /no|day|week|month|year/) { - $time = "00:00:01"; # https://forum.fhem.de/index.php/topic,105787.msg1013920.html#msg1013920 + $time = "00:00:01"; # https://forum.fhem.de/index.php/topic,105787.msg1013920.html#msg1013920 $ntime = "23:59:59"; ($year,$mon,$mday) = split("-", $ndate); $corr = ($i != $ele) ? 86400 : 0; @@ -10724,7 +10725,7 @@ sub DbRep_OutputWriteToDB($$$$$) { ($ndate,undef) = split(" ",FmtDateTime($t1)); } elsif ($aggr =~ /hour/) { $hour = $time; - $time = "$hour:00:01"; # https://forum.fhem.de/index.php/topic,105787.msg1013920.html#msg1013920 + $time = "$hour:00:01"; # https://forum.fhem.de/index.php/topic,105787.msg1013920.html#msg1013920 $ntime = "$hour:59:59"; if ($ntime eq "23:59:59") { ($year,$mon,$mday) = split("-", $ndate); diff --git a/fhem/contrib/DS_Starter/57_SSCal.pm b/fhem/contrib/DS_Starter/57_SSCal.pm index 6dbf9e9aa..948def7aa 100644 --- a/fhem/contrib/DS_Starter/57_SSCal.pm +++ b/fhem/contrib/DS_Starter/57_SSCal.pm @@ -1,5 +1,5 @@ ######################################################################################################################## -# $Id: $ +# $Id: 57_SSCal.pm 21307 2020-02-28 15:09:57Z DS_Starter $ ######################################################################################################################### # 57_SSCal.pm # @@ -3549,12 +3549,12 @@ sub SSCal_setVersionInfo($) { if($modules{$type}{META}{x_prereqs_src} && !$hash->{HELPER}{MODMETAABSENT}) { # META-Daten sind vorhanden $modules{$type}{META}{version} = "v".$v; # Version aus META.json überschreiben, Anzeige mit {Dumper $modules{SSCal}{META}} - if($modules{$type}{META}{x_version}) { # {x_version} ( nur gesetzt wenn $Id: 50_SSCal.pm 20534 2019-11-18 17:50:17Z DS_Starter $ im Kopf komplett! vorhanden ) - $modules{$type}{META}{x_version} =~ s/1.1.1/$v/g if($modules{$type}{META}{x_version} =~ /^1.1.1$/); + if($modules{$type}{META}{x_version}) { # {x_version} ( nur gesetzt wenn $Id: 57_SSCal.pm 21307 2020-02-28 15:09:57Z DS_Starter $ im Kopf komplett! vorhanden ) + $modules{$type}{META}{x_version} =~ s/1.1.1/$v/g if($modules{$type}{META}{x_version} =~ /1.1.1/); } else { $modules{$type}{META}{x_version} = $v; } - return $@ unless (FHEM::Meta::SetInternals($hash)); # FVERSION wird gesetzt ( nur gesetzt wenn $Id: 50_SSCal.pm 20534 2019-11-18 17:50:17Z DS_Starter $ im Kopf komplett! vorhanden ) + return $@ unless (FHEM::Meta::SetInternals($hash)); # FVERSION wird gesetzt ( nur gesetzt wenn $Id: 57_SSCal.pm 21307 2020-02-28 15:09:57Z DS_Starter $ im Kopf komplett! vorhanden ) if(__PACKAGE__ eq "FHEM::$type" || __PACKAGE__ eq $type) { # es wird mit Packages gearbeitet -> Perl übliche Modulversion setzen # mit {->VERSION()} im FHEMWEB kann Modulversion abgefragt werden