FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-25 22:09:21 +00:00
Code Issues Releases Wiki Activity

98_structure.pm: cache the set ? command (Forum #28623)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7023 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-11-19 21:58:08 +00:00
parent 8e8d46ff10
commit b91215d7a4
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/98_structure.pm
View File

@ -81,6 +81,7 @@ structure_Define($$)
}
}
$hash->{CONTENT} = \%list;
delete $hash->{".cachedHelp"};
@a = ( "set", $devname, $stype, $devname );
structure_Attr(@a);
@ -142,7 +143,8 @@ sub structure_Notify($$)
$hash->{DEF} =~ s/^ //;
$hash->{DEF} =~ s/ $//;
delete( $hash->{CONTENT}{$name} );
delete $hash->{CONTENT}{$name};
delete $hash->{".cachedHelp"};
}
}
}
@ -288,6 +290,7 @@ CommandAddStruct($)
@a = ( "set", $hash->{NAME}, $hash->{ATTR}, $hash->{NAME} );
structure_Attr(@a);
delete $hash->{".cachedHelp"};
return undef;
}
@ -315,6 +318,7 @@ CommandDelStruct($)
@a = ( "del", $hash->{NAME}, $hash->{ATTR} );
structure_Attr(@a);
delete $hash->{".cachedHelp"};
return undef;
}
@ -327,6 +331,8 @@ structure_Set($@)
my $ret = "";
my %pars;
# see Forum # 28623 for .cachedHelp
return $hash->{".cachedHelp"} if($list[1] eq "?" && $hash->{".cachedHelp"});
$hash->{INSET} = 1;
my $filter;
@ -357,9 +363,11 @@ structure_Set($@)
if($filter) {
my $ret;
if(defined($defs{$list[0]}) && $defs{$list[0]}{TYPE} eq "structure") {
AnalyzeCommand(undef, "set $list[0] [$filter] ". join(" ", @list[1..@list-1]) );
AnalyzeCommand(undef, "set $list[0] [$filter] ".
join(" ", @list[1..@list-1]) );
} else {
AnalyzeCommand(undef, "set $list[0]:$filter ". join(" ", @list[1..@list-1]) );
AnalyzeCommand(undef, "set $list[0]:$filter ".
join(" ", @list[1..@list-1]) );
}
$sret .= $ret if( $ret );
} else {
@ -376,9 +384,10 @@ structure_Set($@)
}
delete($hash->{INSET});
Log3 $hash, 5, "SET: $ret" if($ret);
return $list[1] eq "?"
? "Unknown argument ?, choose one of " . join(" ", sort keys(%pars))
: undef;
return undef if($list[1] ne "?");
$hash->{".cachedHelp"} = "Unknown argument ?, choose one of " .
join(" ", sort keys(%pars));
return $hash->{".cachedHelp"};
}
###################################