mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-01-31 18:59:33 +00:00
HMInfo:significant corrections for configCheck and cfgState reading
git-svn-id: https://svn.fhem.de/fhem/trunk@22338 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
59895ed97e
commit
5f9473e5c3
@ -1375,7 +1375,7 @@ sub HMinfo_GetFn($@) {#########################################################
|
|||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
(undef,undef,undef,$ret) = split(";",HMinfo_configCheck (join(",",("$name;;",$opt,$filter))),4);
|
(undef,undef,undef,$ret) = split(";",HMinfo_configCheck (join(",",("$name;;",$opt,$filter))),4);
|
||||||
$ret =~s/-ret-/\n/g;
|
$ret = HMinfo_bpPost("$name;;;$ret");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
elsif($cmd eq "configChkResult"){##check peers and register------------------
|
elsif($cmd eq "configChkResult"){##check peers and register------------------
|
||||||
@ -2528,7 +2528,6 @@ sub HMinfo_configCheck ($){ ###################################################
|
|||||||
|
|
||||||
$ret =~ s/\n/-ret-/g; # replace return with a placeholder - we cannot transfere direct
|
$ret =~ s/\n/-ret-/g; # replace return with a placeholder - we cannot transfere direct
|
||||||
|
|
||||||
if(!$id){$ret = HMinfo_applTxt2Check($ret);}# add readable text
|
|
||||||
return "$id;$ret";
|
return "$id;$ret";
|
||||||
}
|
}
|
||||||
sub HMinfo_register ($){ ######################################################
|
sub HMinfo_register ($){ ######################################################
|
||||||
@ -2636,13 +2635,17 @@ sub HMinfo_bpPost($) {#bp finished ############################################
|
|||||||
}
|
}
|
||||||
|
|
||||||
$ret = HMinfo_applTxt2Check($ret);
|
$ret = HMinfo_applTxt2Check($ret);
|
||||||
|
delete $defs{$name}{nb}{$id};
|
||||||
|
$defs{$name}{helper}{cfgChkResult} = $ret;
|
||||||
if ($ret && defined $defs{$cl}){
|
if ($ret && defined $defs{$cl}){
|
||||||
$ret =~s/-ret-/\n/g; # re-insert new-line
|
$ret =~s/-ret-/\n/g; # re-insert new-line
|
||||||
asyncOutput($defs{$cl},$ret);
|
asyncOutput($defs{$cl},$ret);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
delete $defs{$name}{nb}{$id};
|
else{
|
||||||
$defs{$name}{helper}{cfgChkResult} = $ret;
|
return $ret;
|
||||||
return;
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
sub HMinfo_bpAbort($) {#bp timeout ############################################
|
sub HMinfo_bpAbort($) {#bp timeout ############################################
|
||||||
my ($rep) = @_;
|
my ($rep) = @_;
|
||||||
|
Loading…
Reference in New Issue
Block a user