FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 12:58:13 +00:00
Code Issues Releases Wiki Activity

98_FileLogConvert: allow dots in regex' for devicenames and readings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15500 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2017-11-26 04:49:47 +00:00
parent 70502bc5cf
commit dce2a1ac81
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/contrib/98_FileLogConvert.pm
View File

@ -216,8 +216,8 @@ sub FileLogConvert_FileRead($)
$line =~ s/\s{2,}/ /g; $line =~ s/\s{2,}/ /g;
if ($cmd eq "fileEvents") if ($cmd eq "fileEvents")
{ {
next unless ($line =~ /^(\d{4}-\d{2}-\d{2})_(\d{2}:\d{2}:\d{2})\s([A-Za-z0-9._]+)\s([A-Za-z0-9_-]+):\s(\S+)(\s.*)?$/ next unless ($line =~ /^(\d{4}-\d{2}-\d{2})_(\d{2}:\d{2}:\d{2})\s([A-Za-z0-9\.\-_]+)\s([A-Za-z0-9\.\-_]+):\s(\S+)(\s.*)?$/
|| $line =~ /^(\d{4}-\d{2}-\d{2})_(\d{2}:\d{2}:\d{2})\s([A-Za-z0-9._]+)\s([A-Za-z0-9_-]+)$/); || $line =~ /^(\d{4}-\d{2}-\d{2})_(\d{2}:\d{2}:\d{2})\s([A-Za-z0-9\.\-_]+)\s([A-Za-z0-9\.\-_]+)$/);
push @events,$4 if (!grep(/^$4$/,@events)); push @events,$4 if (!grep(/^$4$/,@events));
} }
else else
@ -230,7 +230,7 @@ sub FileLogConvert_FileRead($)
my $i_event; my $i_event;
my $i_value; my $i_value;
my $i_unit = ""; my $i_unit = "";
if ($line =~ /^(\d{4}-\d{2}-\d{2})_(\d{2}:\d{2}:\d{2})\s([A-Za-z0-9._]+)\s([A-Za-z0-9_-]+):\s(\S+)(\s.*)?$/) if ($line =~ /^(\d{4}-\d{2}-\d{2})_(\d{2}:\d{2}:\d{2})\s([A-Za-z0-9\.\-_]+)\s([A-Za-z0-9\.\-_]+):\s(\S+)(\s.*)?$/)
{ {
$i_date = $1; $i_date = $1;
$i_time = $2; $i_time = $2;
@ -245,7 +245,7 @@ sub FileLogConvert_FileRead($)
$i_event = "$i_reading: $i_value"; $i_event = "$i_reading: $i_value";
$i_event .= " $rest" if ($rest); $i_event .= " $rest" if ($rest);
} }
elsif ($line =~ /^(\d{4}-\d{2}-\d{2})_(\d{2}:\d{2}:\d{2})\s([A-Za-z0-9._]+)\s([A-Za-z0-9_-]+)$/) elsif ($line =~ /^(\d{4}-\d{2}-\d{2})_(\d{2}:\d{2}:\d{2})\s([A-Za-z0-9\.\-_]+)\s([A-Za-z0-9\.\-_]+)$/)
{ {
$i_date = $1; $i_date = $1;
$i_time = $2; $i_time = $2;