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

Pass delimiter from unparse function to _enclose_value function, revert

Browse Source 
changes from previous approach
This commit is contained in:
Norcoen
2014-06-03 15:52:36 +02:00
parent 33b1a0d196
commit 0235c24b36
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
parsecsv.lib.php
View File

@@ -463,10 +463,6 @@ class parseCSV {
if ( $delimiter === null ) {
$delimiter = $this->output_delimiter;
}
else {
$this->delimiter = $delimiter;
$this->output_delimiter = $delimiter;
}
$data = $this->unparse($data, $fields, null, null, $delimiter);
@@ -845,7 +841,7 @@ class parseCSV {
// create heading
if ( $this->heading && !$append && !empty($fields) ) {
foreach( $fields as $key => $value ) {
$entry[] = $this->_enclose_value($value);
$entry[] = $this->_enclose_value($value, $delimiter);
}
$string .= implode($delimiter, $entry).$this->linefeed;
@@ -855,7 +851,7 @@ class parseCSV {
// create data
foreach( $data as $key => $row ) {
foreach( $row as $field => $value ) {
$entry[] = $this->_enclose_value($value);
$entry[] = $this->_enclose_value($value, $delimiter);
}
$string .= implode($delimiter, $entry).$this->linefeed;
@@ -1058,11 +1054,14 @@ class parseCSV {
*
* @return Processed value
*/
public function _enclose_value ($value = null) {
public function _enclose_value ($value = null, $delimiter = null) {
if ( $delimiter === null ) {
$delimiter = $this->delimiter;
}
if ( $value !== null && $value != '' ) {
$delimiter = preg_quote($this->delimiter, '/');
$enclosure = preg_quote($this->enclosure, '/');
if ( preg_match("/".$delimiter."|".$enclosure."|\n|\r/i", $value) || ($value{0} == ' ' || substr($value, -1) == ' ') || $this->enclose_all ) {
$delimiter_quoted = preg_quote($delimiter, '/');
$enclosure_quoted = preg_quote($this->enclosure, '/');
if ( preg_match("/".$delimiter_quoted."|".$enclosure_quoted."|\n|\r/i", $value) || ($value{0} == ' ' || substr($value, -1) == ' ') || $this->enclose_all ) {
$value = str_replace($this->enclosure, $this->enclosure.$this->enclosure, $value);
$value = $this->enclosure.$value.$this->enclosure;
}