diff --git a/fhem/CHANGED b/fhem/CHANGED index 3f30be5b6..f1f2620a5 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - bugfix: 93_DbLog: V3.7.1, fix typo in commandref - change: 93_DbRep: V7.5.5, minor corrections in delSeqDoublets - change: 72_FB_CALLMONITOR: new attribute apiKeyKlicktelDe and apiKeySearchCh to configure own private API keys diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm index 728f709e8..524854136 100644 --- a/fhem/FHEM/93_DbLog.pm +++ b/fhem/FHEM/93_DbLog.pm @@ -16,6 +16,7 @@ ############################################################################################################################################ # Versions History done by DS_Starter & DeeSPe: # +# 3.7.1 25.01.2018 fix typo in commandref # 3.7.0 21.01.2018 parsed event with Log 5 added, configCheck enhanced by configuration read check # 3.6.5 19.01.2018 fix lot of logentries if disabled and db not available # 3.6.4 17.01.2018 improve DbLog_Shutdown, extend configCheck by shutdown preparation check @@ -179,7 +180,7 @@ use Blocking; use Time::HiRes qw(gettimeofday tv_interval); use Encode qw(encode_utf8); -my $DbLogVersion = "3.7.0"; +my $DbLogVersion = "3.7.1"; my %columns = ("DEVICE" => 64, "TYPE" => 64, @@ -666,7 +667,7 @@ sub DbLog_Set($@) { Log3($name, 3, "DbLog $name: $crows cache rows exported to $outfile."); - if ($a[-1] =~ m/^purgecache/i) { + if (lc($a[-1]) =~ m/^purgecache/i) { delete $hash->{cache}; readingsSingleUpdate($hash, 'CacheUsage', 0, 1); Log3($name, 3, "DbLog $name: Cache purged after exporting rows to $outfile."); @@ -3439,6 +3440,8 @@ sub DbLog_AddLog($$$) { return if(IsDisabled($name) || !$hash->{HELPER}{COLSET} || $init_done != 1); + $value = DbLog_charfilter($value) if(AttrVal($name, "useCharfilter",0)); + # Funktion aus Attr valueFn validieren if( $value_fn =~ m/^\s*(\{.*\})\s*$/s ) { $value_fn = $1; @@ -3523,7 +3526,6 @@ sub DbLog_AddLog($$$) { ($dev_name,$dev_type,$event,$dev_reading,$read_val,$ut) = DbLog_cutCol($hash,$dev_name,$dev_type,$event,$dev_reading,$read_val,$ut); my $row = ($ts."|".$dev_name."|".$dev_type."|".$event."|".$dev_reading."|".$read_val."|".$ut); - $row = DbLog_charfilter($row) if(AttrVal($name, "useCharfilter",0)); Log3 $hash->{NAME}, 3, "DbLog $name -> addLog created - TS: $ts, Device: $dev_name, Type: $dev_type, Event: $event, Reading: $dev_reading, Value: $read_val, Unit: $ut" if(!AttrVal($name, "suppressAddLogV3",0)); use warnings; @@ -5206,13 +5208,13 @@ sub checkUsePK ($$){
set <name> exportCache [nopurge | purgeCache]
set <name> exportCache [nopurge | purgecache]
set <name> exportCache [nopurge | purgeCache]
set <name> exportCache [nopurge | purgecache]