From daaffec159312ab92820387449210b9e6f668595 Mon Sep 17 00:00:00 2001
From: justme1968 <justme1968@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Tue, 3 May 2016 14:08:47 +0000
Subject: [PATCH] fix for handling of global:RENAME and global:DELETE events

git-svn-id: https://svn.fhem.de/fhem/trunk@11379 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/31_LightScene.pm      | 4 ++--
 fhem/FHEM/33_readingsGroup.pm   | 4 ++--
 fhem/FHEM/33_readingsHistory.pm | 4 ++--
 fhem/FHEM/33_readingsProxy.pm   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fhem/FHEM/31_LightScene.pm b/fhem/FHEM/31_LightScene.pm
index ca55fd6fb..1599679d5 100644
--- a/fhem/FHEM/31_LightScene.pm
+++ b/fhem/FHEM/31_LightScene.pm
@@ -223,7 +223,7 @@ LightScene_Notify($$)
       my ($old, $new) = ($1, $2);
       if( defined($hash->{CONTENT}{$old}) ) {
 
-        $hash->{DEF} =~ s/(\s*)$old(\s*)/$1$new$2/;
+        $hash->{DEF} =~ s/(^|\s+)$old(\s+|$)/$1$new$2/;
 
         foreach my $scene (keys %{ $hash->{SCENES} }) {
           $hash->{SCENES}{$scene}{$new} = $hash->{SCENES}{$scene}{$old} if( defined($hash->{SCENES}{$scene}{$old}) );
@@ -238,7 +238,7 @@ LightScene_Notify($$)
 
       if( defined($hash->{CONTENT}{$name}) ) {
 
-        $hash->{DEF} =~ s/(\s*)$name(\s*)/ /;
+        $hash->{DEF} =~ s/(^|\s+)$name(\s+|$)/ /;
         $hash->{DEF} =~ s/^ //;
         $hash->{DEF} =~ s/ $//;
 
diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm
index 4dada5d19..7b2fb4f60 100644
--- a/fhem/FHEM/33_readingsGroup.pm
+++ b/fhem/FHEM/33_readingsGroup.pm
@@ -1126,7 +1126,7 @@ readingsGroup_Notify($$)
       my ($old, $new) = ($1, $2);
       if( defined($hash->{CONTENT}{$old}) ) {
 
-        $hash->{DEF} =~ s/(\s*)$old((:\S+)?\s*)/$1$new$2/g;
+        $hash->{DEF} =~ s/(^|\s+)$old((:\S+)?\s*)/$1$new$2/g;
       }
       readingsGroup_updateDevices($hash);
     } elsif( $dev->{NAME} eq "global" && $s =~ m/^DELETED ([^ ]*)$/) {
@@ -1134,7 +1134,7 @@ readingsGroup_Notify($$)
 
       if( defined($hash->{CONTENT}{$name}) ) {
 
-        $hash->{DEF} =~ s/(\s*)$name((:\S+)?\s*)/ /g;
+        $hash->{DEF} =~ s/(^|\s+)$name((:\S+)?\s*)/ /g;
         $hash->{DEF} =~ s/^ //;
         $hash->{DEF} =~ s/ $//;
       }
diff --git a/fhem/FHEM/33_readingsHistory.pm b/fhem/FHEM/33_readingsHistory.pm
index 2d93d7d2a..c1fdb0c4a 100644
--- a/fhem/FHEM/33_readingsHistory.pm
+++ b/fhem/FHEM/33_readingsHistory.pm
@@ -394,7 +394,7 @@ readingsHistory_Notify($$)
       my ($old, $new) = ($1, $2);
       if( defined($hash->{CONTENT}{$old}) ) {
 
-        $hash->{DEF} =~ s/(\s*)$old((:\S+)?\s*)/$1$new$2/g;
+        $hash->{DEF} =~ s/(^|\s+)$old((:\S+)?\s*)/$1$new$2/g;
       }
       readingsHistory_updateDevices($hash);
     } elsif( $dev->{NAME} eq "global" && $s =~ m/^DELETED ([^ ]*)$/) {
@@ -402,7 +402,7 @@ readingsHistory_Notify($$)
 
       if( defined($hash->{CONTENT}{$name}) ) {
 
-        $hash->{DEF} =~ s/(\s*)$name((:\S+)?\s*)/ /g;
+        $hash->{DEF} =~ s/(^|\s+)$name((:\S+)?\s*)/ /g;
         $hash->{DEF} =~ s/^ //;
         $hash->{DEF} =~ s/ $//;
       }
diff --git a/fhem/FHEM/33_readingsProxy.pm b/fhem/FHEM/33_readingsProxy.pm
index 3046faf29..7836cd3a9 100644
--- a/fhem/FHEM/33_readingsProxy.pm
+++ b/fhem/FHEM/33_readingsProxy.pm
@@ -159,7 +159,7 @@ readingsProxy_Notify($$)
       my ($old, $new) = ($1, $2);
       if( defined($hash->{CONTENT}{$old}) ) {
 
-        $hash->{DEF} =~ s/(\s*)$old((:\S+)?\s*)/$1$new$2/g;
+        $hash->{DEF} =~ s/(^|\s+)$old((:\S+)?\s*)/$1$new$2/g;
       }
       readingsProxy_updateDevices($hash);
     } elsif( $dev->{NAME} eq "global" && $s =~ m/^DELETED ([^ ]*)$/) {
@@ -167,7 +167,7 @@ readingsProxy_Notify($$)
 
       if( defined($hash->{CONTENT}{$name}) ) {
 
-        $hash->{DEF} =~ s/(\s*)$name((:\S+)?\s*)/ /g;
+        $hash->{DEF} =~ s/(^|\s+)$name((:\S+)?\s*)/ /g;
         $hash->{DEF} =~ s/^ //;
         $hash->{DEF} =~ s/ $//;
       }