tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Icinga\Protocol\File\FileReader: use Icinga\Util\Enumerate

Browse Source
This commit is contained in:
Alexander Klimov 2014-09-05 12:03:59 +02:00
parent 982cda6805
commit 52c1d98beb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Icinga/Protocol/File/FileReader.php
View File

@ -6,6 +6,7 @@ namespace Icinga\Protocol\File;
use Icinga\Data\Selectable; use Icinga\Data\Selectable;
use Countable; use Countable;
use Icinga\Util\Enumerate;
use Zend_Config; use Zend_Config;
/** /**
@ -52,7 +53,9 @@ class FileReader implements Selectable, Countable
*/ */
public function iterate() public function iterate()
{ {
return new FileIterator($this->filename, $this->fields); return new Enumerate(
new FileIterator($this->filename, $this->fields)
);
} }
/** /**
@ -117,15 +120,13 @@ class FileReader implements Selectable, Countable
$skip = $count - ($skip + $read); $skip = $count - ($skip + $read);
} }
} }
$index = 0; foreach ($this->iterate() as $index => $line) {
foreach ($this->iterate() as $line) {
if ($index >= $skip) { if ($index >= $skip) {
if ($index >= $skip + $read) { if ($index >= $skip + $read) {
break; break;
} }
$lines[] = $line; $lines[] = $line;
} }
++$index;
} }
if ($query->sortDesc()) { if ($query->sortDesc()) {
$lines = array_reverse($lines); $lines = array_reverse($lines);