From 3a9426986c8aee472ea09989ae3f63fc22132cd8 Mon Sep 17 00:00:00 2001 From: nasseeder1 <> Date: Sun, 11 Sep 2016 13:11:28 +0000 Subject: [PATCH] 93_DbRep: changed format of diffValue-reading if no value was selected git-svn-id: https://svn.fhem.de/fhem/trunk@12136 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 ++ fhem/FHEM/93_DbRep.pm | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 594b1fdc1..dfb59dd66 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # 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: changed format of diffValue-reading if no value was + selected - new: 24_TPLinkHS110: Support for TPLink HS100/110 wifi power outlet - bugfix: 73_GasCalculator: get/set list corrected for CounterDevice - bugfix: 73_ElectricityCalculator: get/set list corrected for CounterDevice diff --git a/fhem/FHEM/93_DbRep.pm b/fhem/FHEM/93_DbRep.pm index 962f35fff..d58ecf78a 100644 --- a/fhem/FHEM/93_DbRep.pm +++ b/fhem/FHEM/93_DbRep.pm @@ -37,6 +37,7 @@ ########################################################################################################### # Versions History: # +# 3.7.3 11.09.2016 changed format of diffValue-reading if no value was selected # 3.7.2 04.09.2016 problem in diffValue fixed if if no value was selected # 3.7.1 31.08.2016 Reading "errortext" added, commandref continued, exportToFile changed, # diffValue changed to fix wrong timestamp if error occur @@ -1314,10 +1315,10 @@ sub diffval_DoParse($) { if(!@array) { if(AttrVal($name, "aggregation", "") eq "hour") { my @rsf = split(/[" "\|":"]/,$runtime_string_first); - @array = ($runtime_string." "."0"." ".$rsf[0]."_".$rsf[1]."\n"); + @array = ($runtime_string." ".$rsf[0]."_".$rsf[1]."\n"); } else { my @rsf = split(" ",$runtime_string_first); - @array = ($runtime_string." "."0"." ".$rsf[0]."\n"); + @array = ($runtime_string." ".$rsf[0]."\n"); } } push(@row_array, @array); @@ -1386,7 +1387,7 @@ sub diffval_ParseDone($) { my $value = $a[3]?$a[3]:0; - $a[3] =~ s/:/-/g if($a[2]); # substituieren unsopported characters -> siehe fhem.pl + $a[2] =~ s/:/-/g if($a[2]); # substituieren unsupported characters -> siehe fhem.pl my $timestamp = $a[2]?$a[1]."_".$a[2]:$a[1]; # Leerzeichen am Ende $timestamp entfernen @@ -2680,4 +2681,4 @@ return ($runtime,$runtime_string,$runtime_string_first,$runtime_string_next,$ll) =end html_DE -=cut \ No newline at end of file +=cut