FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 20:17:45 +00:00
Code Issues Releases Wiki Activity

98_structure.pm: change switching order (Forum #42853)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9689 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-10-26 14:01:48 +00:00
parent e36f27a75f
commit 95cf28136e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/98_structure.pm
View File

@ -307,8 +307,8 @@ CommandAddStruct($)
foreach my $d (devspec2array($a[0])) { foreach my $d (devspec2array($a[0])) {
$hash->{CONTENT}{$d} = 1; $hash->{CONTENT}{$d} = 1;
$hash->{DEF} .= " $d";
} }
$hash->{DEF} = $hash->{ATTR} . " " . join(" ",sort keys %{$hash->{CONTENT}});
@a = ( "set", $hash->{NAME}, $hash->{ATTR}, $hash->{NAME} ); @a = ( "set", $hash->{NAME}, $hash->{ATTR}, $hash->{NAME} );
structure_Attr(@a); structure_Attr(@a);
@ -335,8 +335,9 @@ CommandDelStruct($)
foreach my $d (devspec2array($a[0])) { foreach my $d (devspec2array($a[0])) {
delete($hash->{CONTENT}{$d}); delete($hash->{CONTENT}{$d});
$hash->{DEF} =~ s/\b$d\b//g;
} }
$hash->{DEF} = $hash->{ATTR} . " " . join(" ",sort keys %{$hash->{CONTENT}}); $hash->{DEF} =~ s/ / /g;
@a = ( "del", $hash->{NAME}, $hash->{ATTR} ); @a = ( "del", $hash->{NAME}, $hash->{ATTR} );
structure_Attr(@a); structure_Attr(@a);
@ -370,7 +371,9 @@ structure_Set($@)
} }
} }
foreach my $d (sort keys %{ $hash->{CONTENT} }) { my @devList = split("[ \t][ \t]*", $hash->{DEF});
shift @devList;
foreach my $d (@devList) {
next if(!$defs{$d}); next if(!$defs{$d});
if($defs{$d}{INSET}) { if($defs{$d}{INSET}) {
Log3 $hash, 1, "ERROR: endless loop detected for $d in " . $hash->{NAME}; Log3 $hash, 1, "ERROR: endless loop detected for $d in " . $hash->{NAME};
@ -475,7 +478,9 @@ structure_Attr($@)
$hash->{INATTR} = 1; $hash->{INATTR} = 1;
my $ret = ""; my $ret = "";
foreach my $d (sort keys %{ $hash->{CONTENT} }) { my @devList = split("[ \t][ \t]*", $hash->{DEF});
shift @devList;
foreach my $d (@devList) {
next if(!$defs{$d}); next if(!$defs{$d});
if($attr{$d} && $attr{$d}{structexclude}) { if($attr{$d} && $attr{$d}{structexclude}) {
my $se = $attr{$d}{structexclude}; my $se = $attr{$d}{structexclude};