From 2f2f69a2c98b581e73f7cb55dc34170631f64cbb Mon Sep 17 00:00:00 2001
From: deespe <DeeSPe@users.noreply.github.com>
Date: Sun, 26 Nov 2017 04:49:47 +0000
Subject: [PATCH] 98_FileLogConvert: allow dots in regex' for devicenames and
 readings

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@15500 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 contrib/98_FileLogConvert.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/98_FileLogConvert.pm b/contrib/98_FileLogConvert.pm
index a827aaa57..f099f05e4 100644
--- a/contrib/98_FileLogConvert.pm
+++ b/contrib/98_FileLogConvert.pm
@@ -216,8 +216,8 @@ sub FileLogConvert_FileRead($)
     $line =~ s/\s{2,}/ /g;
     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.*)?$/
-        || $line =~ /^(\d{4}-\d{2}-\d{2})_(\d{2}:\d{2}:\d{2})\s([A-Za-z0-9._]+)\s([A-Za-z0-9_-]+)$/);
+      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\.\-_]+)$/);
       push @events,$4 if (!grep(/^$4$/,@events));
     }
     else
@@ -230,7 +230,7 @@ sub FileLogConvert_FileRead($)
       my $i_event;
       my $i_value;
       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_time = $2;
@@ -245,7 +245,7 @@ sub FileLogConvert_FileRead($)
         $i_event = "$i_reading: $i_value";
         $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_time = $2;