From 69a46b6c7bb99ab5cd7286cd7f15e1ba23c8c694 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Mon, 30 Jul 2012 09:52:57 +0000 Subject: [PATCH] The regexp is also tries to match timestamp:device:event git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1774 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/92_FileLog.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/FHEM/92_FileLog.pm b/FHEM/92_FileLog.pm index 562a91411..12d3fca15 100755 --- a/FHEM/92_FileLog.pm +++ b/FHEM/92_FileLog.pm @@ -98,12 +98,13 @@ FileLog_Log($$) my $n = $dev->{NAME}; my $re = $log->{REGEXP}; my $max = int(@{$dev->{CHANGED}}); + my $tn = TimeNow(); + my $ct = $dev->{CHANGETIME}; for (my $i = 0; $i < $max; $i++) { my $s = $dev->{CHANGED}[$i]; $s = "" if(!defined($s)); - if($n =~ m/^$re$/ || "$n:$s" =~ m/^$re$/) { - my $t = TimeNow(); - $t = $dev->{CHANGETIME}[$i] if(defined($dev->{CHANGETIME}[$i])); + my $t = (($ct && $ct->[$i]) ? $ct->[$i] : $tn); + if($n =~ m/^$re$/ || "$n:$s" =~ m/^$re$/ || "$t:$n:$s" =~ m/^$re$/) { $t =~ s/ /_/; # Makes it easier to parse with gnuplot FileLog_Switch($log);