From e8c357f68218224814814889333b5f19da65b89a Mon Sep 17 00:00:00 2001 From: Adrien Loison Date: Wed, 12 Oct 2016 10:22:49 -0700 Subject: [PATCH] Add option to preserve empty rows when reading an ODS file --- src/Spout/Reader/ODS/Reader.php | 2 +- src/Spout/Reader/ODS/RowIterator.php | 243 ++++++++++++++---- src/Spout/Reader/ODS/Sheet.php | 5 +- src/Spout/Reader/ODS/SheetIterator.php | 9 +- tests/Spout/Reader/ODS/ReaderTest.php | 39 ++- tests/resources/ods/sheet_with_empty_row.ods | Bin 2571 -> 0 bytes tests/resources/ods/sheet_with_empty_rows.ods | Bin 0 -> 9253 bytes 7 files changed, 230 insertions(+), 68 deletions(-) delete mode 100644 tests/resources/ods/sheet_with_empty_row.ods create mode 100644 tests/resources/ods/sheet_with_empty_rows.ods diff --git a/src/Spout/Reader/ODS/Reader.php b/src/Spout/Reader/ODS/Reader.php index a52bafa..d040f90 100644 --- a/src/Spout/Reader/ODS/Reader.php +++ b/src/Spout/Reader/ODS/Reader.php @@ -42,7 +42,7 @@ class Reader extends AbstractReader $this->zip = new \ZipArchive(); if ($this->zip->open($filePath) === true) { - $this->sheetIterator = new SheetIterator($filePath, $this->shouldFormatDates); + $this->sheetIterator = new SheetIterator($filePath, $this->shouldFormatDates, $this->shouldPreserveEmptyRows); } else { throw new IOException("Could not open $filePath for reading."); } diff --git a/src/Spout/Reader/ODS/RowIterator.php b/src/Spout/Reader/ODS/RowIterator.php index 48a78e6..4051583 100644 --- a/src/Spout/Reader/ODS/RowIterator.php +++ b/src/Spout/Reader/ODS/RowIterator.php @@ -23,33 +23,55 @@ class RowIterator implements IteratorInterface const MAX_COLUMNS_EXCEL = 16384; /** Definition of XML attribute used to parse data */ + const XML_ATTRIBUTE_NUM_ROWS_REPEATED = 'table:number-rows-repeated'; const XML_ATTRIBUTE_NUM_COLUMNS_REPEATED = 'table:number-columns-repeated'; /** @var \Box\Spout\Reader\Wrapper\XMLReader The XMLReader object that will help read sheet's XML data */ protected $xmlReader; + /** @var bool Whether empty rows should be returned or skipped */ + protected $shouldPreserveEmptyRows; + /** @var Helper\CellValueFormatter Helper to format cell values */ protected $cellValueFormatter; /** @var bool Whether the iterator has already been rewound once */ protected $hasAlreadyBeenRewound = false; - /** @var int Number of read rows */ - protected $numReadRows = 0; - /** @var array|null Buffer used to store the row data, while checking if there are more rows to read */ protected $rowDataBuffer = null; /** @var bool Indicates whether all rows have been read */ protected $hasReachedEndOfFile = false; + /** @var int Last row index processed (one-based) */ + protected $lastRowIndexProcessed = 0; + + /** @var int Row index to be processed next (one-based) */ + protected $nextRowIndexToBeProcessed = 1; + + /** @var mixed|null Value of the last processed cell (because when reading cell at column N+1, cell N is processed) */ + protected $lastProcessedCellValue = null; + + /** @var int Number of times the last processed row should be repeated */ + protected $numRowsRepeated = 1; + + /** @var int Number of times the last cell value should be copied to the cells on its right */ + protected $numColumnsRepeated = 1; + + /** @var bool Whether at least one cell has been read for the row currently being processed */ + protected $hasAlreadyReadOneCellInCurrentRow = false; + + /** * @param XMLReader $xmlReader XML Reader, positioned on the "" element * @param bool $shouldFormatDates Whether date/time values should be returned as PHP objects or be formatted as strings + * @param bool $shouldPreserveEmptyRows Whether empty rows should be returned or skipped */ - public function __construct($xmlReader, $shouldFormatDates) + public function __construct($xmlReader, $shouldFormatDates, $shouldPreserveEmptyRows) { $this->xmlReader = $xmlReader; + $this->shouldPreserveEmptyRows = $shouldPreserveEmptyRows; $this->cellValueFormatter = new CellValueFormatter($shouldFormatDates); } @@ -71,7 +93,8 @@ class RowIterator implements IteratorInterface } $this->hasAlreadyBeenRewound = true; - $this->numReadRows = 0; + $this->lastRowIndexProcessed = 0; + $this->nextRowIndexToBeProcessed = 1; $this->rowDataBuffer = null; $this->hasReachedEndOfFile = false; @@ -98,61 +121,72 @@ class RowIterator implements IteratorInterface * @throws \Box\Spout\Common\Exception\IOException If unable to read the sheet data XML */ public function next() + { + if ($this->doesNeedDataForNextRowToBeProcessed()) { + $this->readDataForNextRow($this->xmlReader); + } + + $this->lastRowIndexProcessed++; + } + + /** + * Returns whether we need data for the next row to be processed. + * We don't need to read data if: + * we have already read at least one row + * AND + * we need to preserve empty rows + * AND + * the last row that was read is not the row that need to be processed + * (i.e. if we need to return empty rows) + * + * @return bool Whether we need data for the next row to be processed. + */ + protected function doesNeedDataForNextRowToBeProcessed() + { + $hasReadAtLeastOneRow = ($this->lastRowIndexProcessed !== 0); + + return ( + !$hasReadAtLeastOneRow || + !$this->shouldPreserveEmptyRows || + $this->lastRowIndexProcessed === $this->nextRowIndexToBeProcessed - 1 + ); + } + + /** + * @param \Box\Spout\Reader\Wrapper\XMLReader $xmlReader XMLReader object + * @return void + * @throws \Box\Spout\Reader\Exception\SharedStringNotFoundException If a shared string was not found + * @throws \Box\Spout\Common\Exception\IOException If unable to read the sheet data XML + */ + protected function readDataForNextRow($xmlReader) { $rowData = []; - $cellValue = null; - $numColumnsRepeated = 1; - $numCellsRead = 0; - $hasAlreadyReadOneCell = false; try { - while ($this->xmlReader->read()) { - if ($this->xmlReader->isPositionedOnStartingNode(self::XML_NODE_CELL)) { - // Start of a cell description - $currentNumColumnsRepeated = $this->getNumColumnsRepeatedForCurrentNode(); + while ($xmlReader->read()) { + if ($xmlReader->isPositionedOnStartingNode(self::XML_NODE_ROW)) { + $this->processRowStartingNode($xmlReader); - $node = $this->xmlReader->expand(); - $currentCellValue = $this->getCellValue($node); + } else if ($xmlReader->isPositionedOnStartingNode(self::XML_NODE_CELL)) { + $rowData = $this->processCellStartingNode($xmlReader, $rowData); - // process cell N only after having read cell N+1 (see below why) - if ($hasAlreadyReadOneCell) { - for ($i = 0; $i < $numColumnsRepeated; $i++) { - $rowData[] = $cellValue; - } + } else if ($xmlReader->isPositionedOnEndingNode(self::XML_NODE_ROW)) { + $isEmptyRow = $this->isEmptyRow($rowData, $this->lastProcessedCellValue); + + // if the fetched row is empty and we don't want to preserve it... + if (!$this->shouldPreserveEmptyRows && $isEmptyRow) { + // ... skip it + continue; } - $cellValue = $currentCellValue; - $numColumnsRepeated = $currentNumColumnsRepeated; + $rowData = $this->processRowEndingNode($rowData, $isEmptyRow); - $numCellsRead++; - $hasAlreadyReadOneCell = true; - - } else if ($this->xmlReader->isPositionedOnEndingNode(self::XML_NODE_ROW)) { - // End of the row description - $isEmptyRow = ($numCellsRead <= 1 && $this->isEmptyCellValue($cellValue)); - if ($isEmptyRow) { - // skip empty rows - $this->next(); - return; - } - - // Only add the value if the last read cell is not a trailing empty cell repeater in Excel. - // The current count of read columns is determined by counting the values in $rowData. - // This is to avoid creating a lot of empty cells, as Excel adds a last empty "" - // with a number-columns-repeated value equals to the number of (supported columns - used columns). - // In Excel, the number of supported columns is 16384, but we don't want to returns rows with - // always 16384 cells. - if ((count($rowData) + $numColumnsRepeated) !== self::MAX_COLUMNS_EXCEL) { - for ($i = 0; $i < $numColumnsRepeated; $i++) { - $rowData[] = $cellValue; - } - $this->numReadRows++; - } + // at this point, we have all the data we need for the row + // so that we can populate the buffer break; - } else if ($this->xmlReader->isPositionedOnEndingNode(self::XML_NODE_TABLE)) { - // The closing "" marks the end of the file - $this->hasReachedEndOfFile = true; + } else if ($xmlReader->isPositionedOnEndingNode(self::XML_NODE_TABLE)) { + $this->processTableEndingNode(); break; } } @@ -165,11 +199,99 @@ class RowIterator implements IteratorInterface } /** + * @param \Box\Spout\Reader\Wrapper\XMLReader $xmlReader XMLReader object, positioned on a "" starting node + * @return void + */ + protected function processRowStartingNode($xmlReader) + { + // Reset data from current row + $this->hasAlreadyReadOneCellInCurrentRow = false; + $this->lastProcessedCellValue = null; + $this->numColumnsRepeated = 1; + $this->numRowsRepeated = $this->getNumRowsRepeatedForCurrentNode($xmlReader); + } + + /** + * @param \Box\Spout\Reader\Wrapper\XMLReader $xmlReader XMLReader object, positioned on a "" starting node + * @param array $rowData Data of all cells read so far + * @return array Original row data + data for the cell that was just read + */ + protected function processCellStartingNode($xmlReader, $rowData) + { + $currentNumColumnsRepeated = $this->getNumColumnsRepeatedForCurrentNode($xmlReader); + + $node = $xmlReader->expand(); + $currentCellValue = $this->getCellValue($node); + + // process cell N only after having read cell N+1 (see below why) + if ($this->hasAlreadyReadOneCellInCurrentRow) { + for ($i = 0; $i < $this->numColumnsRepeated; $i++) { + $rowData[] = $this->lastProcessedCellValue; + } + } + + $this->hasAlreadyReadOneCellInCurrentRow = true; + $this->lastProcessedCellValue = $currentCellValue; + $this->numColumnsRepeated = $currentNumColumnsRepeated; + + return $rowData; + } + + /** + * @param array $rowData Data of all cells read so far + * @param bool $isEmptyRow Whether the given row is empty + * @return array + */ + protected function processRowEndingNode($rowData, $isEmptyRow) + { + // if the row is empty, we don't want to return more than one cell + $actualNumColumnsRepeated = (!$isEmptyRow) ? $this->numColumnsRepeated : 1; + + // Only add the value if the last read cell is not a trailing empty cell repeater in Excel. + // The current count of read columns is determined by counting the values in $rowData. + // This is to avoid creating a lot of empty cells, as Excel adds a last empty "" + // with a number-columns-repeated value equals to the number of (supported columns - used columns). + // In Excel, the number of supported columns is 16384, but we don't want to returns rows with + // always 16384 cells. + if ((count($rowData) + $actualNumColumnsRepeated) !== self::MAX_COLUMNS_EXCEL) { + for ($i = 0; $i < $actualNumColumnsRepeated; $i++) { + $rowData[] = $this->lastProcessedCellValue; + } + } + + // If we are processing row N and the row is repeated M times, + // then the next row to be processed will be row (N+M). + $this->nextRowIndexToBeProcessed += $this->numRowsRepeated; + + return $rowData; + } + + /** + * @return void + */ + protected function processTableEndingNode() + { + // The closing "" marks the end of the file + $this->hasReachedEndOfFile = true; + } + + /** + * @param \Box\Spout\Reader\Wrapper\XMLReader $xmlReader XMLReader object, positioned on a "" starting node + * @return int The value of "table:number-rows-repeated" attribute of the current node, or 1 if attribute missing + */ + protected function getNumRowsRepeatedForCurrentNode($xmlReader) + { + $numRowsRepeated = $xmlReader->getAttribute(self::XML_ATTRIBUTE_NUM_ROWS_REPEATED); + return ($numRowsRepeated !== null) ? intval($numRowsRepeated) : 1; + } + + /** + * @param \Box\Spout\Reader\Wrapper\XMLReader $xmlReader XMLReader object, positioned on a "" starting node * @return int The value of "table:number-columns-repeated" attribute of the current node, or 1 if attribute missing */ - protected function getNumColumnsRepeatedForCurrentNode() + protected function getNumColumnsRepeatedForCurrentNode($xmlReader) { - $numColumnsRepeated = $this->xmlReader->getAttribute(self::XML_ATTRIBUTE_NUM_COLUMNS_REPEATED); + $numColumnsRepeated = $xmlReader->getAttribute(self::XML_ATTRIBUTE_NUM_COLUMNS_REPEATED); return ($numColumnsRepeated !== null) ? intval($numColumnsRepeated) : 1; } @@ -185,14 +307,21 @@ class RowIterator implements IteratorInterface } /** - * empty() replacement that honours 0 as a valid value + * After finishing processing each cell, a row is considered empty if it contains + * no cells or if the value of the last read cell is an empty string. + * After finishing processing each cell, the last read cell is not part of the + * row data yet (as we still need to apply the "num-columns-repeated" attribute). * - * @param string|int|float|bool|\DateTime|\DateInterval|null $value The cell value - * @return bool + * @param array $rowData + * @param string|int|float|bool|\DateTime|\DateInterval|null The value of the last read cell + * @return bool Whether the row is empty */ - protected function isEmptyCellValue($value) + protected function isEmptyRow($rowData, $lastReadCellValue) { - return (!isset($value) || trim($value) === ''); + return ( + count($rowData) === 0 && + (!isset($lastReadCellValue) || trim($lastReadCellValue) === '') + ); } /** @@ -214,7 +343,7 @@ class RowIterator implements IteratorInterface */ public function key() { - return $this->numReadRows; + return $this->lastRowIndexProcessed; } diff --git a/src/Spout/Reader/ODS/Sheet.php b/src/Spout/Reader/ODS/Sheet.php index 98d00b1..91669e0 100644 --- a/src/Spout/Reader/ODS/Sheet.php +++ b/src/Spout/Reader/ODS/Sheet.php @@ -28,12 +28,13 @@ class Sheet implements SheetInterface /** * @param XMLReader $xmlReader XML Reader, positioned on the "" element * @param bool $shouldFormatDates Whether date/time values should be returned as PHP objects or be formatted as strings + * @param bool $shouldPreserveEmptyRows Whether empty rows should be returned or skipped * @param int $sheetIndex Index of the sheet, based on order in the workbook (zero-based) * @param string $sheetName Name of the sheet */ - public function __construct($xmlReader, $shouldFormatDates, $sheetIndex, $sheetName) + public function __construct($xmlReader, $shouldFormatDates, $shouldPreserveEmptyRows, $sheetIndex, $sheetName) { - $this->rowIterator = new RowIterator($xmlReader, $shouldFormatDates); + $this->rowIterator = new RowIterator($xmlReader, $shouldFormatDates, $shouldPreserveEmptyRows); $this->index = $sheetIndex; $this->name = $sheetName; } diff --git a/src/Spout/Reader/ODS/SheetIterator.php b/src/Spout/Reader/ODS/SheetIterator.php index 50224c1..2c1cafa 100644 --- a/src/Spout/Reader/ODS/SheetIterator.php +++ b/src/Spout/Reader/ODS/SheetIterator.php @@ -27,6 +27,9 @@ class SheetIterator implements IteratorInterface /** @var bool Whether date/time values should be returned as PHP objects or be formatted as strings */ protected $shouldFormatDates; + /** @var bool Whether empty rows should be returned or skipped */ + protected $shouldPreserveEmptyRows; + /** @var XMLReader The XMLReader object that will help read sheet's XML data */ protected $xmlReader; @@ -42,12 +45,14 @@ class SheetIterator implements IteratorInterface /** * @param string $filePath Path of the file to be read * @param bool $shouldFormatDates Whether date/time values should be returned as PHP objects or be formatted as strings + * @param bool $shouldPreserveEmptyRows Whether empty rows should be returned or skipped * @throws \Box\Spout\Reader\Exception\NoSheetsFoundException If there are no sheets in the file */ - public function __construct($filePath, $shouldFormatDates) + public function __construct($filePath, $shouldFormatDates, $shouldPreserveEmptyRows) { $this->filePath = $filePath; $this->shouldFormatDates = $shouldFormatDates; + $this->shouldPreserveEmptyRows = $shouldPreserveEmptyRows; $this->xmlReader = new XMLReader(); /** @noinspection PhpUnnecessaryFullyQualifiedNameInspection */ @@ -116,7 +121,7 @@ class SheetIterator implements IteratorInterface $escapedSheetName = $this->xmlReader->getAttribute(self::XML_ATTRIBUTE_TABLE_NAME); $sheetName = $this->escaper->unescape($escapedSheetName); - return new Sheet($this->xmlReader, $this->shouldFormatDates, $sheetName, $this->currentSheetIndex); + return new Sheet($this->xmlReader, $this->shouldFormatDates, $this->shouldPreserveEmptyRows, $sheetName, $this->currentSheetIndex); } /** diff --git a/tests/Spout/Reader/ODS/ReaderTest.php b/tests/Spout/Reader/ODS/ReaderTest.php index dee4164..d8ec39b 100644 --- a/tests/Spout/Reader/ODS/ReaderTest.php +++ b/tests/Spout/Reader/ODS/ReaderTest.php @@ -211,15 +211,39 @@ class ReaderTest extends \PHPUnit_Framework_TestCase /** * @return void */ - public function testReadShouldSkipEmptyRow() + public function testReadShouldSkipEmptyRowsIfShouldPreserveEmptyRowsNotSet() { - $allRows = $this->getAllRowsForFile('sheet_with_empty_row.ods'); - $this->assertEquals(2, count($allRows), 'There should be only 2 rows, because the empty row is skipped'); + $allRows = $this->getAllRowsForFile('sheet_with_empty_rows.ods'); + + $this->assertEquals(3, count($allRows), 'There should be only 3 rows, because the empty rows are skipped'); $expectedRows = [ - ['ods--11', 'ods--12', 'ods--13'], - // row skipped here + // skipped row here ['ods--21', 'ods--22', 'ods--23'], + // skipped row here + // skipped row here + ['ods--51', 'ods--52', 'ods--53'], + ['ods--61', 'ods--62', 'ods--63'], + ]; + $this->assertEquals($expectedRows, $allRows); + } + + /** + * @return void + */ + public function testReadShouldReturnEmptyLinesIfShouldPreserveEmptyRowsSet() + { + $allRows = $this->getAllRowsForFile('sheet_with_empty_rows.ods', false, true); + + $this->assertEquals(6, count($allRows), 'There should be 6 rows'); + + $expectedRows = [ + [''], + ['ods--21', 'ods--22', 'ods--23'], + [''], + [''], + ['ods--51', 'ods--52', 'ods--53'], + ['ods--61', 'ods--62', 'ods--63'], ]; $this->assertEquals($expectedRows, $allRows); } @@ -485,15 +509,18 @@ class ReaderTest extends \PHPUnit_Framework_TestCase /** * @param string $fileName * @param bool|void $shouldFormatDates + * @param bool|void $shouldPreserveEmptyRows * @return array All the read rows the given file */ - private function getAllRowsForFile($fileName, $shouldFormatDates = false) + private function getAllRowsForFile($fileName, $shouldFormatDates = false, $shouldPreserveEmptyRows = false) { $allRows = []; $resourcePath = $this->getResourcePath($fileName); + /** @var \Box\Spout\Reader\ODS\Reader $reader */ $reader = ReaderFactory::create(Type::ODS); $reader->setShouldFormatDates($shouldFormatDates); + $reader->setShouldPreserveEmptyRows($shouldPreserveEmptyRows); $reader->open($resourcePath); foreach ($reader->getSheetIterator() as $sheetIndex => $sheet) { diff --git a/tests/resources/ods/sheet_with_empty_row.ods b/tests/resources/ods/sheet_with_empty_row.ods deleted file mode 100644 index 4763df0bbd15e0770e109dd9b66ebee88df5270c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2571 zcmZ{m2{hDeAIHbomzG=hWlSMEldX_6moTQu7$MsmF*M8!*_xCr(Uhf7)?AV|ON{JU zvvkRlK@75tozM&>WOt|D`@X7k-{*h+=RD{CJm24Q&iDMjpZ|k|v$F96001t46#SU+ z{0Z5d2_OJ4$p--NGQT=|;(gJ0UljrlOR;Xp4?zys%qp@`F-8Y@G(u_5&UHJh;`D>F ztjZ6gq)pl$)h(JH$F&uSWnhAvImK-0{u+XgTr#b`%JvjIu9FVqi0(p&;xay&@+(pwm38gTEC;2iyDt|U z9F%CO8+}~JkJqEz)r+`hZWP8!;X-E2kE%0(;b$CF@dH76v)T8A- z7D{t}1UzMiFw`ivd4GwpKq%~8LJVu58Q1Tojbb4fJl7(Qw%qt{)5Od2%Bvo62RL8l z{}H>rZagh(F}j4m?6AN{lH)OV^Qw3;1SA-WnrtnC!G5m&7F>ryBpqx%t1BN&i$L%_ zq?_%+VK( z()GNaX(BipW8FtKWVK0jwW{)cGP4mHK3gK{FF#v{)Y*fWN@giayz5rn8-N~tze(ny z22sBpnjGICE-!84K%j6`n1}WDH8epc6{NZsn}3HD`F9im09j@fnBD)s!Off@&R>Em z!!8=B{&yP};G(0XaVeeXKw~b?GE*b)<2IZV9^;Dk`JSD!xCZyP5WahhfjpD9CTLn0 z;))G;b+OrW7Q_4k4m+(_RLbjg^-skowGs>hi)EH~((60cj@;FmtUqg>x4587irJhx zQ(LyVTKEc7dX>fd@DZmxS(jRx7J`jo>{8SpsQ{knbjy1ef(5Q&xsMmeQ?sI`Q2IvF zMWeGc@e$l5ZQiXu7=MROou-Q&xg4;to{;l$V`Y zTdB2|JDMaJRC0^+XMg53FMI&9005#)f4G?b;LyHK-*6Hg3&r1s96tY5JA4|)Uj9HK z{I?hf)vgslf*#Dg-l$xDj>daJ8f@ua`&56g^GtN)Bnj6dq;tj20u}3R+9j9g;Uhoy zZcbSnIdNCRR;$kuR@dF*T&DPW!(NdMXF2+u8x{$TtF91DG*?rBfJznS+_)qleX9j9 zQZYUgUy(&&l=A-+zttnw_9 z=ww0+3=_DSRxO!YV-o-6t6aUgK=J+Tgy@VA9yUv+8gd z6(%9-vs_s1sZTx2tzQ>~a*>53cvwF6{%WFzyl~3iPjh2u!FV^`rO%v#%n<0E0w&aa zmQ3>-^5(G2{0N3t4p&72o+{5skGsV=aijC@QKmlGUlBO3FI?1>?1L5$-Mm52UXT;t$-Bo*(3Nfe8mk(aiQ z<&zzA4~Cd~BAYb3iTd@a9RsnV+cpIOV$VZUkxQ<-j`G_^wNm$_x=wuB=^JvV71V?j zxOE7n4*(>bo#WdY P2lKIJ!a405aR7e-7MVx^ diff --git a/tests/resources/ods/sheet_with_empty_rows.ods b/tests/resources/ods/sheet_with_empty_rows.ods new file mode 100644 index 0000000000000000000000000000000000000000..e7ad29a6c7059191903d71ed0b69aae04e72aba0 GIT binary patch literal 9253 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 literal 0 HcmV?d00001