diff --git a/CHANGED b/CHANGED index d51f7f3c2..4671e871c 100644 --- a/CHANGED +++ b/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. + - changed: 93_DbRep: V4.10.3, rename reading "diff-overrun_limit-" + to "diff_overrun_limit_" - changed: 57_Calendar: avoid some warnings - bufix: 00_MQTT: fixed delete MQTT_DEVICE - update: 98_DOIFtools: suppress lookup windows in DOIF or DOIFtools diff --git a/FHEM/93_DbRep.pm b/FHEM/93_DbRep.pm index 78bb61e30..8faa6fc33 100644 --- a/FHEM/93_DbRep.pm +++ b/FHEM/93_DbRep.pm @@ -3,7 +3,7 @@ ########################################################################################################## # 93_DbRep.pm # -# (c) 2016 by Heiko Maaz +# (c) 2016-2017 by Heiko Maaz # e-mail: Heiko dot Maaz at t-online dot de # # This Module can be used to select and report content of databases written by 93_DbLog module @@ -40,6 +40,8 @@ ########################################################################################################### # Versions History: # +# 4.10.3 01.02.2017 rename reading "diff-overrun_limit-" to "diff_overrun_limit_", +# collaggstr day aggregation changed back from 4.7.5 change # 4.10.2 16.01.2017 bugfix uninitialized value $renmode if RenameAgent # 4.10.1 30.11.2016 bugfix importFromFile format problem if UNIT-field wasn't set # 4.10 28.12.2016 del_DoParse changed to use Wildcards, del_ParseDone changed to use readingNameMap @@ -170,7 +172,7 @@ use Blocking; use Time::Local; # no if $] >= 5.017011, warnings => 'experimental'; -my $DbRepVersion = "4.10.2"; +my $DbRepVersion = "4.10.3"; my %dbrep_col = ("DEVICE" => 64, "TYPE" => 64, @@ -2111,7 +2113,7 @@ sub diffval_ParseDone($) { } readingsBulkUpdate($hash, "background_processing_time", sprintf("%.4f",$brt)) if(AttrVal($name, "showproctime", undef)); readingsBulkUpdate($hash, "sql_processing_time", sprintf("%.4f",$rt)) if(AttrVal($name, "showproctime", undef)); - readingsBulkUpdate($hash, "diff-overrun_limit-".$difflimit, $rowsrej) if($rowsrej); + readingsBulkUpdate($hash, "diff_overrun_limit_".$difflimit, $rowsrej) if($rowsrej); readingsBulkUpdate($hash, "less_data_in_period", $ncpstr) if($ncpstr); readingsBulkUpdate($hash, "state", ($ncpstr||$rowsrej)?"Warning":"done"); readingsEndUpdate($hash, 1); @@ -3559,7 +3561,7 @@ sub collaggstr($$$$) { $runtime_string_first = strftime "%Y-%m-%d", localtime($runtime) if($i>1); $runtime = $runtime+3600 if(dsttest($hash,$runtime,$aggsec)); # Korrektur Winterzeitumstellung (Uhr wurde 1 Stunde zurück gestellt) - if((($tsstr gt $testr) ? $runtime : ($runtime+$aggsec-1)) > $epoch_seconds_end) { + if((($tsstr gt $testr) ? $runtime : ($runtime+$aggsec)) > $epoch_seconds_end) { $runtime_string_first = strftime "%Y-%m-%d", localtime($runtime); $runtime_string_first = strftime "%Y-%m-%d %H:%M:%S", localtime($runtime) if( $dsstr eq $destr); $runtime_string_next = strftime "%Y-%m-%d %H:%M:%S", localtime($epoch_seconds_end); @@ -4024,7 +4026,7 @@ return;
  • diffAccept - valid for function diffValue. diffAccept determines the threshold, up to that a calaculated difference between two straight sequently datasets should be commenly accepted (default = 20).
    Hence faulty DB entries with a disproportional high difference value will be eliminated and don't tamper the result. - If a threshold overrun happens, the reading "diff-overrun_limit-<diffLimit>" will be generated + If a threshold overrun happens, the reading "diff_overrun_limit_<diffLimit>" will be generated (<diffLimit> will be substituted with the present prest attribute value).
    The reading contains a list of relevant pair of values. Using verbose=3 this list will also be reported in the FHEM logfile. @@ -4115,11 +4117,11 @@ return;