FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

Statefile fix by Boris/Thomas

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@811 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2011-01-29 07:24:29 +00:00
parent c95f19049a
commit f6155c7498
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/fhem.pl
View File

@ -42,6 +42,7 @@ use Time::HiRes qw(gettimeofday);
sub AddDuplicate($$); sub AddDuplicate($$);
sub AnalyzeCommand($$); sub AnalyzeCommand($$);
sub AnalyzeCommandChain($$); sub AnalyzeCommandChain($$);
sub AnalyzePerlCommand($$);
sub AnalyzeInput($); sub AnalyzeInput($);
sub AssignIoPort($); sub AssignIoPort($);
sub AttrVal($$$); sub AttrVal($$$);
@ -164,7 +165,7 @@ my $nextat; # Time when next timer will be triggered.
my $intAtCnt=0; my $intAtCnt=0;
my %duplicate; # Pool of received msg for multi-fhz/cul setups my %duplicate; # Pool of received msg for multi-fhz/cul setups
my $duplidx=0; # helper for the above pool my $duplidx=0; # helper for the above pool
my $cvsid = '$Id: fhem.pl,v 1.122 2011-01-22 21:53:18 neubert Exp $'; my $cvsid = '$Id: fhem.pl,v 1.123 2011-01-29 07:24:29 rudolfkoenig Exp $';
my $namedef = my $namedef =
"where <name> is either:\n" . "where <name> is either:\n" .
"- a single device name\n" . "- a single device name\n" .
@ -927,7 +928,7 @@ WriteStatefile()
print SFH "define $d $defs{$d}{TYPE} $defs{$d}{DEF}\n" print SFH "define $d $defs{$d}{TYPE} $defs{$d}{DEF}\n"
if($defs{$d}{VOLATILE}); if($defs{$d}{VOLATILE});
print SFH "setstate $d $defs{$d}{STATE}\n" print SFH "setstate $d $defs{$d}{STATE}\n"
if($defs{$d}{STATE} && if(defined($defs{$d}{STATE}) &&
$defs{$d}{STATE} ne "unknown" && $defs{$d}{STATE} ne "unknown" &&
$defs{$d}{STATE} ne "Initialized"); $defs{$d}{STATE} ne "Initialized");
@ -1155,6 +1156,7 @@ CommandDefine($$)
my $ret = CallFn($a[0], "DefFn", \%hash, $def); my $ret = CallFn($a[0], "DefFn", \%hash, $def);
if($ret) { if($ret) {
Log 1, $ret;
delete $defs{$a[0]}; # Veto delete $defs{$a[0]}; # Veto
delete $attr{$a[0]}; delete $attr{$a[0]};