cvs: pear /File/File CSV.php

dufuz Sat May 12 17:33:11 2007 UTC

Modified files:
/pear/File/File CSV.php
Log:
now it parses the first 2 lines of test 033 correctly

http://cvs.php.net/viewvc.cgi/pear/F...&diff_format=u
Index: pear/File/File/CSV.php
diff -u pear/File/File/CSV.php:1.37 pear/File/File/CSV.php:1.38
--- pear/File/File/CSV.php:1.37 Sat May 12 00:14:20 2007
+++ pear/File/File/CSV.php Sat May 12 17:33:11 2007
@@ -18,7 +18,7 @@
* @author Helgi Þormar <dufuz@php.net>
* @copyright 2004-2005 The Authors
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: CSV.php,v 1.37 2007/05/12 00:14:20 dufuz Exp $
+ * @version CVS: $Id: CSV.php,v 1.38 2007/05/12 17:33:11 dufuz Exp $
* @link http://pear.php.net/package/File
*/

@@ -226,6 +226,7 @@
$old = $prev;
$prev = $c;
$c = $ch;
+
// Common case
if ($c != $quote && $c != $sep && $c != "\n" && $c != "\r") {
$buff .= $c;
@@ -252,6 +253,9 @@
// When does the quote end, make sure it's not double quoted
if ($c == $sep && $prev == $quote && $old != $quote) {
$in_quote = false;
+ } elseif ($c == $sep && $buff == $quote.$quote) {
+ var_dump($buff);
+ $in_quote = false;
} elseif ($c == "\n" || $c == "\r") {
$sub = ($prev == "\r") ? 2 : 1;
$buff_len = strlen($buff);