From dfd2c6bac898d952606a2a72ea4d4abbce83cd56 Mon Sep 17 00:00:00 2001 From: Sailor Date: Mon, 8 Feb 2021 08:17:38 +0000 Subject: [PATCH] 73_ElectricityCalculator: Bugfix - Handling of Readnings with . git-svn-id: https://svn.fhem.de/fhem/trunk@23696 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/73_ElectricityCalculator.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/73_ElectricityCalculator.pm b/fhem/FHEM/73_ElectricityCalculator.pm index 533951327..386f79c97 100644 --- a/fhem/FHEM/73_ElectricityCalculator.pm +++ b/fhem/FHEM/73_ElectricityCalculator.pm @@ -422,8 +422,8 @@ sub ElectricityCalculator_MidnightTimer($) my $RegEx = $ElectricityCalcDev->{REGEXP}; my ($ElectricityCountName, $ElectricityCountReadingRegEx) = split(":", $RegEx, 2); my $ElectricityCountDev = $defs{$ElectricityCountName}; - $ElectricityCountReadingRegEx =~ s/[\.\*]//g; - + $ElectricityCountReadingRegEx =~ s/[\.\*]+$//; + my @ElectricityCountReadingNameListComplete = keys(%{$ElectricityCountDev->{READINGS}}); my @ElectricityCountReadingNameListFiltered; @@ -437,7 +437,9 @@ sub ElectricityCalculator_MidnightTimer($) Log3 $ElectricityCalcName, 5, $ElectricityCalcName. " : ElectricityCalculator_MidnightTimer__________________________________________________________"; Log3 $ElectricityCalcName, 5, $ElectricityCalcName. " : ElectricityCalculator_MidnightTimer : MidnightTimer initiated"; Log3 $ElectricityCalcName, 5, $ElectricityCalcName. " : ElectricityCalculator_MidnightTimer - RegEx : " . $RegEx; + Log3 $ElectricityCalcName, 5, $ElectricityCalcName. " : ElectricityCalculator_MidnightTimer - ReadingRegEx : " . $ElectricityCountReadingRegEx; Log3 $ElectricityCalcName, 5, $ElectricityCalcName. " : ElectricityCalculator_MidnightTimer - ElectricityCountName : " . $ElectricityCountName; + Log3 $ElectricityCalcName, 5, $ElectricityCalcName. " : ElectricityCalculator_MidnightTimer - ElectricityCountReadComp : " . Dumper(@ElectricityCountReadingNameListComplete); Log3 $ElectricityCalcName, 5, $ElectricityCalcName. " : ElectricityCalculator_MidnightTimer - ElectricityCountReadList : " . Dumper(@ElectricityCountReadingNameListFiltered);