mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

93_DbRep: changed format of diffValue-reading if no value was selected

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12136 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1
2016-09-11 13:11:28 +00:00
parent 00aebaaa36
commit ffac0c42f8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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 - new: 24_TPLinkHS110: Support for TPLink HS100/110 wifi power outlet
- bugfix: 73_GasCalculator: get/set list corrected for CounterDevice - bugfix: 73_GasCalculator: get/set list corrected for CounterDevice
- bugfix: 73_ElectricityCalculator: get/set list corrected for CounterDevice - bugfix: 73_ElectricityCalculator: get/set list corrected for CounterDevice

7
fhem/FHEM/93_DbRep.pm
View File

@@ -37,6 +37,7 @@
########################################################################################################### ###########################################################################################################
# Versions History: # 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.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, # 3.7.1 31.08.2016 Reading "errortext" added, commandref continued, exportToFile changed,
# diffValue changed to fix wrong timestamp if error occur # diffValue changed to fix wrong timestamp if error occur
@@ -1314,10 +1315,10 @@ sub diffval_DoParse($) {
if(!@array) { if(!@array) {
if(AttrVal($name, "aggregation", "") eq "hour") { if(AttrVal($name, "aggregation", "") eq "hour") {
my @rsf = split(/[" "\|":"]/,$runtime_string_first); my @rsf = split(/[" "\|":"]/,$runtime_string_first);
@array = ($runtime_string." "."0"." ".$rsf[0]."_".$rsf[1]."\n"); @array = ($runtime_string." ".$rsf[0]."_".$rsf[1]."\n");
} else { } else {
my @rsf = split(" ",$runtime_string_first); my @rsf = split(" ",$runtime_string_first);
@array = ($runtime_string." "."0"." ".$rsf[0]."\n"); @array = ($runtime_string." ".$rsf[0]."\n");
} }
} }
push(@row_array, @array); push(@row_array, @array);
@@ -1386,7 +1387,7 @@ sub diffval_ParseDone($) {
my $value = $a[3]?$a[3]:0; 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]; my $timestamp = $a[2]?$a[1]."_".$a[2]:$a[1];
# Leerzeichen am Ende $timestamp entfernen # Leerzeichen am Ende $timestamp entfernen