parsecsv/parsecsv-for-php
1
0
Fork 0
mirror of https://github.com/parsecsv/parsecsv-for-php.git synced 2026-02-19 08:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue when CSV data does not end with a newline

Browse Source 
If CSV data didn't end with "\n", "\r", or "\r\n" the last line of the
CSV would be ignored, as the parser wouldn't trigger end of row logic
for the last row.

This change forces the parser to process the end of the CSV data as it's
own character (false), and deals with end of data just like it treats
end of row.
This commit is contained in:
Jim Myhrberg
2014-06-05 01:07:31 +01:00
parent 9cf0ba9f97
commit cff692d976
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
parsecsv.lib.php
View File

@@ -666,9 +666,16 @@ class parseCSV {
$was_enclosed = false;
$strlen = strlen($data);
// force the parser to process end of data as a character (false) when
// data does not end with a line feed or carriage return character.
$lch = $data{$strlen-1};
if ($lch != "\n" && $lch != "\r") {
$strlen++;
}
// walk through each character
for ( $i=0; $i < $strlen; $i++ ) {
$ch = $data{$i};
$ch = ( isset($data{$i}) ) ? $data{$i} : false ;
$nch = ( isset($data{$i+1}) ) ? $data{$i+1} : false ;
$pch = ( isset($data{$i-1}) ) ? $data{$i-1} : false ;
@@ -734,9 +741,9 @@ class parseCSV {
$enclosed = false;
}
// end of field/row
// end of field/row/csv
}
elseif ( ($ch == $this->delimiter || $ch == "\n" || $ch == "\r") && !$enclosed ) {
elseif ( ($ch == $this->delimiter || $ch == "\n" || $ch == "\r" || $ch === false) && !$enclosed ) {
$key = ( !empty($head[$col]) ) ? $head[$col] : $col ;
$row[$key] = ( $was_enclosed ) ? $current : trim($current) ;
$current = '';
@@ -744,7 +751,7 @@ class parseCSV {
$col++;
// end of row
if ( $ch == "\n" || $ch == "\r" ) {
if ( $ch == "\n" || $ch == "\r" || $ch === false ) {
if ( $this->_validate_offset($row_count) && $this->_validate_row_conditions($row, $this->conditions) ) {
if ( $this->heading && empty($head) ) {
$head = $row;