2 Commits
0.2.0 ... 0.2.1

Author SHA1 Message Date
zynode
82049f1701 Fixed stupid code which caused auto function to not work in some situations.
git-svn-id: http://parsecsv-for-php.googlecode.com/svn/trunk@12 339761fc-0c37-0410-822d-8b8cac1f6a97
2007-08-08 10:38:25 +00:00
zynode
72fde0424d fixed ChangeLog.txt line feeds to Windows friendliness
git-svn-id: http://parsecsv-for-php.googlecode.com/svn/trunk@10 339761fc-0c37-0410-822d-8b8cac1f6a97
2007-08-07 20:27:33 +00:00
2 changed files with 107 additions and 95 deletions

View File

@@ -1,3 +1,13 @@
parseCSV 0.2.1
-----------------------------------
Date: 8-Aug-2007
- Fixed stupid code which caused auto function
to not work in some situations.
-----------------------------------
parseCSV 0.2.0 beta parseCSV 0.2.0 beta
----------------------------------- -----------------------------------
Date: 2-Jan-2007 Date: 2-Jan-2007

View File

@@ -4,7 +4,7 @@ class parseCSV {
/* /*
Class: parseCSV v0.2.0 beta Class: parseCSV v0.2.1
http://code.google.com/p/parsecsv-for-php/ http://code.google.com/p/parsecsv-for-php/
Created by Jim Myhrberg (jim@zydev.info). Created by Jim Myhrberg (jim@zydev.info).
@@ -230,10 +230,12 @@ class parseCSV {
if ( $prefered === null ) $prefered = $this->auto_prefered; if ( $prefered === null ) $prefered = $this->auto_prefered;
if ( empty($data) ) { if ( empty($this->file_data) ) {
if ( $this->check_data() ) { if ( $this->check_data($file) ) {
$data = &$this->file_data; $data = &$this->file_data;
} else return false; } else return false;
} else {
$data = &$this->file_data;
} }
$chars = array(); $chars = array();
@@ -324,7 +326,7 @@ class parseCSV {
$data = ltrim($strip[1]); $data = ltrim($strip[1]);
} }
if ( $this->convert_encoding ) $data = iconv($this->input_encoding, $this->output_encoding, $data); if ( $this->convert_encoding ) $data = iconv($this->input_encoding, $this->output_encoding, $data);
if ( $data[strlen($data)-1] != "\n" ) $data .= "\n"; if ( substr($data, -1) != "\n" ) $data .= "\n";
$this->file_data = &$data; $this->file_data = &$data;
return true; return true;
} }