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

92_FileLog.pm: seekTo bug (Forum #45005)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10085 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2015-12-04 15:41:21 +00:00
parent 9977e1dfa6
commit c8de9a0d22
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fhem/FHEM/92_FileLog.pm
View File

@@ -942,8 +942,13 @@ FileLog_seekTo($$$$$)
$fh->seek(0, 2); # Go to the end
my $upper = $fh->tell;
my ($lower, $next, $last) = (0, $upper/2, 0);
my ($lower, $next, $last) = (0, $upper/2, -1);
while() { # Binary search
if($next == $last) {
$fh->seek($next, 0);
last;
}
$fh->seek($next, 0);
my $data = <$fh>;
if(!$data) {
@@ -952,24 +957,8 @@ FileLog_seekTo($$$$$)
}
if($reformatFn) { no strict; $data = &$reformatFn($data); use strict; }
if($data !~ m/^\d\d\d\d-\d\d-\d\d_\d\d:\d\d:\d\d /o) {
$next = $fh->tell;
$data = <$fh>;
if(!$data) {
$last = seekBackOneLine($fh, $next);
last;
}
if($reformatFn) { no strict; $data = &$reformatFn($data); use strict; }
# If the second line is longer then the first,
# binary search will never get it:
if($next eq $last && $data ge $ts) {
$last = seekBackOneLine($fh, $next);
last;
}
}
if($next eq $last) {
$fh->seek($next, 0);
last;
$next = seekBackOneLine($fh, $fh->tell);
next;
}
$last = $next;