From 90a4a4bf5258829ba11024a9773bd8fb866cdd00 Mon Sep 17 00:00:00 2001 From: DS_Starter Date: Mon, 10 Sep 2018 19:42:04 +0000 Subject: [PATCH] 93_DbLog: contrib 3.12.0 git-svn-id: https://svn.fhem.de/fhem/trunk@17321 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/93_DbLog.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fhem/contrib/DS_Starter/93_DbLog.pm b/fhem/contrib/DS_Starter/93_DbLog.pm index dca661446..e03419895 100644 --- a/fhem/contrib/DS_Starter/93_DbLog.pm +++ b/fhem/contrib/DS_Starter/93_DbLog.pm @@ -513,10 +513,12 @@ sub DbLog_Set($@) { my $ret; if ($a[1] eq 'reduceLog') { + my ($od,$nd) = split(":",$a[2]); # $od - Tage älter als , $nd - Tage neuer als + if ($nd && $nd <= $od) {return "The second day value must be greater than the first one ! ";} if (defined($a[3]) && $a[3] !~ /^average$|^average=.+|^EXCLUDE=.+$|^INCLUDE=.+$/i) { return "ReduceLog syntax error in set command. Please see commandref for help."; } - if (defined $a[2] && $a[2] =~ /^\d+$/) { + if (defined $a[2] && $a[2] =~ /(^\d+$)|(^\d+:\d+$)/) { $ret = DbLog_reduceLog($hash,@a); InternalTimer(gettimeofday()+5, "DbLog_execmemcache", $hash, 0); } else { @@ -525,6 +527,8 @@ sub DbLog_Set($@) { } } elsif ($a[1] eq 'reduceLogNbl') { + my ($od,$nd) = split(":",$a[2]); # $od - Tage älter als , $nd - Tage neuer als + if ($nd && $nd <= $od) {return "The second day value must be greater than the first one ! ";} if (defined($a[3]) && $a[3] !~ /^average$|^average=.+|^EXCLUDE=.+$|^INCLUDE=.+$/i) { return "ReduceLogNbl syntax error in set command. Please see commandref for help."; }