From ef7389138f43dd913d688738a12bdb5aa63f896c Mon Sep 17 00:00:00 2001 From: tupol <> Date: Sun, 19 Nov 2017 12:30:39 +0000 Subject: [PATCH] statistics: attribut singularReadings now multiline git-svn-id: https://svn.fhem.de/fhem/trunk@15455 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_statistics.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fhem/FHEM/98_statistics.pm b/fhem/FHEM/98_statistics.pm index 8db4c39b1..d33b5b6cb 100644 --- a/fhem/FHEM/98_statistics.pm +++ b/fhem/FHEM/98_statistics.pm @@ -139,7 +139,7 @@ sub statistics_Initialize($) ."periodChangePreset " ."specialDeltaPeriodHours " ."specialDeltaPeriods " - ."singularReadings " + ."singularReadings:textField-long " ."tendencyReadings " .$readingFnAttributes; } @@ -578,6 +578,7 @@ sub statistics_doStatisticMinMaxSingle ($$$$$$) # Store single readings my $singularReadings = AttrVal($name, "singularReadings", ""); + $singularReadings=~s/\n|\r//g; if ($singularReadings ne "") { # statistics_storeSingularReadings $hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$lastValue,$saveLast my $statValue = sprintf "%.".$decPlaces."f", $stat[1]; @@ -653,6 +654,7 @@ sub statistics_doStatisticTendency ($$$) # Store single readings my $singularReadings = AttrVal($name, "singularReadings", ""); + $singularReadings=~s/\n|\r//g; if ($singularReadings ne "") { # statistics_storeSingularReadings $hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$lastValue,$saveLast statistics_storeSingularReadings ($name,$singularReadings,$dev,$statReadingName,$readingName,"Tendency","1h",$stat[1],0,0); @@ -793,6 +795,7 @@ sub statistics_doStatisticDelta ($$$$) # Store single readings my $singularReadings = AttrVal($name, "singularReadings", ""); + $singularReadings=~s/\n|\r//g; if ($singularReadings ne "") { # statistics_storeSingularReadings $hashName,$singularReadings,$dev,$statReadingName,$readingName,$statType,$period,$statValue,$lastValue,$saveLast my $statValue = sprintf "%.".$decPlaces."f", $stat[1]; @@ -1025,6 +1028,7 @@ sub statistics_doStatisticDurationSingle ($$$$$$) # Store single readings my $singularReadings = AttrVal($name, "singularReadings", ""); + $singularReadings=~s/\n|\r//g; if ($singularReadings ne "") { # Do this for each state of the current or last period while (my ($statKey, $statValue) = each(%stat) ) {