From 5d6f999e5eec778e6463415e508582cb9d97cc74 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Thu, 16 Jan 2014 09:45:47 +0000
Subject: [PATCH] Notify/FileLog: notify bug fixed

git-svn-id: https://svn.fhem.de/fhem/trunk@4664 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/91_notify.pm  | 10 +---------
 fhem/FHEM/92_FileLog.pm | 12 ++++--------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/fhem/FHEM/91_notify.pm b/fhem/FHEM/91_notify.pm
index d4832a828..31ab6a57d 100755
--- a/fhem/FHEM/91_notify.pm
+++ b/fhem/FHEM/91_notify.pm
@@ -39,15 +39,7 @@ notify_Define($$)
   return "Bad regexp: $@" if($@);
   $hash->{REGEXP} = $re;
   $hash->{STATE} = "active";
-
-  if(($re =~ m/^([^:]*)$/ ||
-      $re =~ m/^([^:]*):(.*)$/) &&
-     defined($defs{$1})) {
-    $hash->{NOTIFYDEV} = $1
-  } else {
-    delete($hash->{NOTIFYDEV}); # when called by modify
-  }
-
+  notifyRegexpChanged($hash, $re);
 
   return undef;
 }
diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm
index 9f4a3fef3..5633f3f79 100755
--- a/fhem/FHEM/92_FileLog.pm
+++ b/fhem/FHEM/92_FileLog.pm
@@ -70,14 +70,7 @@ FileLog_Define($@)
   $hash->{logfile} = $a[2];
   $hash->{currentlogfile} = $f;
   $hash->{STATE} = "active";
-
-  if(($a[3] =~ m/^([^:]*)$/ ||
-      $a[3] =~ m/^([^:]*):(.*)$/) &&
-     defined($defs{$1})) {
-    $hash->{NOTIFYDEV} = $1
-  } else {
-    delete($hash->{NOTIFYDEV}); # when called by modify
-  }
+  notifyRegexpChanged($hash, $a[3]);
 
   return undef;
 }
@@ -222,6 +215,7 @@ FileLog_Set($@)
     return "Bad regexp: $@" if($@);
     $hash->{REGEXP} = $re;
     $hash->{DEF} = $hash->{logfile} ." $re";
+    notifyRegexpChanged($hash, $re);
     
   } elsif($cmd eq "removeRegexpPart") {
     my %h;
@@ -234,6 +228,7 @@ FileLog_Set($@)
     return "Bad regexp: $@" if($@);
     $hash->{REGEXP} = $re;
     $hash->{DEF} = $hash->{logfile} ." $re";
+    notifyRegexpChanged($hash, $re);
 
   } elsif($cmd eq "absorb") {
     my $victim = $a[2];
@@ -270,6 +265,7 @@ FileLog_Set($@)
 
     $hash->{REGEXP} .= "|".$vh->{REGEXP};
     $hash->{DEF} = $hash->{logfile} . " ". $hash->{REGEXP};
+    notifyRegexpChanged($hash, $hash->{REGEXP});
     CommandDelete(undef, $victim);
 
   }