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

Set the default from the last value if nothing found for the required range.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1602 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-06-03 19:13:23 +00:00
parent 119355b689
commit 242f0bf8bd
1 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
fhem/FHEM/92_FileLog.pm
View File

@ -253,15 +253,31 @@ FileLog_Get($@)
my %lastdate; my %lastdate;
my $d; # Used by eval functions my $d; # Used by eval functions
while(my $l = <$ifh>) {
next if($l lt $from); my ($rescan, $rescanNum, $rescanIdx, @rescanArr);
$rescan = 0;
RESCAN:
for(;;) {
my $l;
if($rescan) {
last if($rescanIdx<=1 || !$rescanNum);
$l = $rescanArr[--$rescanIdx];
} else {
$l = <$ifh>;
last if(!$l);
}
next if($l lt $from && !$rescan);
last if($l gt $to); last if($l gt $to);
my @fld = split("[ \r\n]+", $l); # 40% my @fld = split("[ \r\n]+", $l); # 40% CPU
for my $i (0..int(@a)-1) { # Process each req. field for my $i (0..int(@a)-1) { # Process each req. field
my $h = $d[$i]; my $h = $d[$i];
next if($rescan && $h->{ret});
my @missingvals; my @missingvals;
next if($h->{re} && $l !~ m/$h->{re}/); # 20% next if($h->{re} && $l !~ m/$h->{re}/); # 20% CPU
my $col = $h->{col}; my $col = $h->{col};
my $t = $h->{type}; my $t = $h->{type};
@ -305,7 +321,6 @@ FileLog_Get($@)
$val = $1 if($fld[$col] =~ m/^(\d+).*/o); $val = $1 if($fld[$col] =~ m/^(\d+).*/o);
} else { # evaluate } else { # evaluate
$val = eval($h->{fn}); $val = eval($h->{fn});
} }
@ -317,23 +332,44 @@ FileLog_Get($@)
$cnt[$i]++; $cnt[$i]++;
$lastv[$i] = $val; $lastv[$i] = $val;
$lastd[$i] = $dte; $lastd[$i] = $dte;
foreach my $mval (@missingvals) { map { $cnt[$i]++; $min[$i] = 0 if(0 < $min[$i]); } @missingvals;
$cnt[$i]++;
$min[$i] = 0 if(0 < $min[$i]);
}
if($outf eq "-") { if($outf eq "-") {
$h->{ret} .= "$dte $val\n"; $h->{ret} .= "$dte $val\n";
foreach my $mval (@missingvals) { $h->{ret} .= $mval } map { $h->{ret} .= $_ } @missingvals;
} else { } else {
my $fh = $h->{fh}; # cannot use $h->{fh} in print directly my $fh = $h->{fh}; # cannot use $h->{fh} in print directly
print $fh "$dte $val\n"; print $fh "$dte $val\n";
foreach my $mval (@missingvals) { print $fh $mval } map { print $fh $_ } @missingvals;
$h->{count}++;
} }
$h->{count}++;
$rescanNum--;
last if(!$rescanNum);
} }
} }
# If no value found for some of the required columns, then look for the last
# matching entry outside of the range. Known as the "window left open
# yesterday" problem
if(!$rescan) {
$rescanNum = 0;
map { $rescanNum++ if(!$d[$_]->{count} && $d[$_]->{df} eq "") } (0..$#a);
if($rescanNum) {
$rescan=1;
my $buf;
my $end = $hash->{pos}{"$inf:$from"};
my $start = $end - 1024;
$start = 0 if($start < 0);
$ifh->seek($start, 0);
sysread($ifh, $buf, $end-$start);
@rescanArr = split("\n", $buf);
$rescanIdx = $#rescanArr;
goto RESCAN;
}
}
$ifh->close(); $ifh->close();
my $ret = ""; my $ret = "";
@ -361,6 +397,7 @@ FileLog_Get($@)
$h->{count}++; $h->{count}++;
} }
} }
if($outf eq "-") { if($outf eq "-") {
$h->{ret} .= "$from $h->{df}\n" if(!$h->{ret} && $h->{df} ne ""); $h->{ret} .= "$from $h->{df}\n" if(!$h->{ret} && $h->{df} ne "");
$ret .= $h->{ret} if($h->{ret}); $ret .= $h->{ret} if($h->{ret});