mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

00_CUL.pm: preserve data when CUL_Parse called recursivly (Forum #37418)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@8637 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2015-05-26 12:02:54 +00:00
parent 282c5e746e
commit 3618ecdb07
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/00_CUL.pm
View File

@@ -502,6 +502,8 @@ CUL_ReadAnswer($$$$)
my ($mculdata, $rin) = ("", '');
my $buf;
my $to = 3; # 3 seconds timeout
$mculdata = $hash->{PARTIAL} if(defined($hash->{PARTIAL}));
$to = $ohash->{RA_Timeout} if($ohash->{RA_Timeout}); # ...or less
for(;;) {
@@ -540,10 +542,12 @@ CUL_ReadAnswer($$$$)
while(($mculdata =~ m/^([^\n]*\n)(.*)/s) || $anydata) {
my $line = ($anydata ? $mculdata : $1);
$mculdata = $2;
$hash->{PARTIAL} = $mculdata; # for recursive calls
(undef, $line) = CUL_prefix(0, $ohash, $line); # Delete prefix
if($regexp && $line !~ m/$regexp/) {
$line =~ s/[\n\r]+//g;
CUL_Parse($ohash, $hash, $ohash->{NAME}, $line);
$mculdata = $hash->{PARTIAL};
} else {
return (undef, $line);
}
@@ -780,7 +784,9 @@ CUL_Read($)
my $rmsg;
($rmsg,$culdata) = split("\n", $culdata, 2);
$rmsg =~ s/\r//;
$hash->{PARTIAL} = $culdata; # for recursive calls
CUL_Parse($hash, $hash, $name, $rmsg) if($rmsg);
$culdata = $hash->{PARTIAL};
}
$hash->{PARTIAL} = $culdata;
}