From f2756af889e6e4e851b6bb303bb0a1944489afc0 Mon Sep 17 00:00:00 2001 From: Sailor Date: Mon, 8 Feb 2021 08:17:39 +0000 Subject: [PATCH] 73_WaterCalculator: Bugfix - Handling of Readnings with . git-svn-id: https://svn.fhem.de/fhem/trunk@23697 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/73_WaterCalculator.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fhem/FHEM/73_WaterCalculator.pm b/fhem/FHEM/73_WaterCalculator.pm index 94776c1f3..ad0317a72 100644 --- a/fhem/FHEM/73_WaterCalculator.pm +++ b/fhem/FHEM/73_WaterCalculator.pm @@ -435,7 +435,7 @@ sub WaterCalculator_MidnightTimer($) my $RegEx = $WaterCalcDev->{REGEXP}; my ($WaterCountName, $WaterCountReadingRegEx) = split(":", $RegEx, 2); my $WaterCountDev = $defs{$WaterCountName}; - $WaterCountReadingRegEx =~ s/[\.\*]//g; + $WaterCountReadingRegEx =~ s/[\.\*]+$//; my @WaterCountReadingNameListComplete = keys(%{$WaterCountDev->{READINGS}}); my @WaterCountReadingNameListFiltered; @@ -450,7 +450,9 @@ sub WaterCalculator_MidnightTimer($) Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer__________________________________________________________"; Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer : MidnightTimer initiated"; Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer - RegEx : " . $RegEx; + Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer - ReadingRegEx : " . $WaterCountReadingRegEx; Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer - WaterCountName : " . $WaterCountName; + Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer - WaterCountReadComp: " . Dumper(@WaterCountReadingNameListComplete); Log3 $WaterCalcName, 5, $WaterCalcName. " : WaterCalculator_MidnightTimer - WaterCountReadList: " . Dumper(@WaterCountReadingNameListFiltered);