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

removed back comments

Browse Source
This commit is contained in:
William Knauss
2014-05-13 18:22:18 -04:00
parent af5d7cf70d
commit 0457fbfba2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
parsecsv.lib.php
View File

@@ -674,7 +674,7 @@ class parseCSV {
$i++; $i++;
} }
elseif ( $nch != $this->delimiter && $nch != "\r" && $nch != "\n" ) { elseif ( $nch != $this->delimiter && $nch != "\r" && $nch != "\n" ) {
#for ( $x=($i+1); isset($data{$x}) && ltrim($data{$x}, $white_spaces) == ''; $x++ ) {} //this line does nothing? for ( $x=($i+1); isset($data{$x}) && ltrim($data{$x}, $white_spaces) == ''; $x++ ) {}
if ( $data{$x} == $this->delimiter ) { if ( $data{$x} == $this->delimiter ) {
$enclosed = false; $enclosed = false;
$i = $x; $i = $x;
@@ -727,7 +727,7 @@ class parseCSV {
if ( isset($rows[$row[$this->sort_by]]) ) { if ( isset($rows[$row[$this->sort_by]]) ) {
$rows[$row[$this->sort_by].'_0'] = &$rows[$row[$this->sort_by]]; $rows[$row[$this->sort_by].'_0'] = &$rows[$row[$this->sort_by]];
unset($rows[$row[$this->sort_by]]); unset($rows[$row[$this->sort_by]]);
#for ( $sn=1; isset($rows[$row[$this->sort_by].'_'.$sn]); $sn++ ) {} //this line does nothing for ( $sn=1; isset($rows[$row[$this->sort_by].'_'.$sn]); $sn++ ) {}
$rows[$row[$this->sort_by].'_'.$sn] = $row; $rows[$row[$this->sort_by].'_'.$sn] = $row;
} }
else $rows[$row[$this->sort_by]] = $row; else $rows[$row[$this->sort_by]] = $row;
@@ -893,12 +893,15 @@ class parseCSV {
foreach( $conditions as $key => $value ) { foreach( $conditions as $key => $value ) {
if ( strpos($value, ' AND ') !== false ) { if ( strpos($value, ' AND ') !== false ) {
$value = explode(' AND ', $value); $value = explode(' AND ', $value);
$and = ''; $and = '';
foreach( $value as $k => $v ) { foreach( $value as $k => $v ) {
$and .= $this->_validate_row_condition($row, $v); $and .= $this->_validate_row_condition($row, $v);
} }
$or .= (strpos($and, '0') !== false) ? '0' : '1' ; $or .= (strpos($and, '0') !== false) ? '0' : '1' ;
} else { }
else {
$or .= $this->_validate_row_condition($row, $value); $or .= $this->_validate_row_condition($row, $value);
} }
} }