cvs: pear /File/File CSV.php

dufuz Sat May 12 20:26:06 2007 UTC

Modified files:
/pear/File/File CSV.php
Log:
add a comment

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.39 pear/File/File/CSV.php:1.40
--- pear/File/File/CSV.php:1.39 Sat May 12 17:34:08 2007
+++ pear/File/File/CSV.php Sat May 12 20:26:06 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.39 2007/05/12 17:34:08 dufuz Exp $
+ * @version CVS: $Id: CSV.php,v 1.40 2007/05/12 20:26:06 dufuz Exp $
* @link http://pear.php.net/package/File
*/

@@ -215,18 +215,20 @@
return false;
}

- $buff = $prev = $c = '';
+ $buff = $old = $prev = $c = '';
$ret = array();
$i = 1;
$in_quote = false;
$quote = $conf['quote'];
$f = $conf['fields'];
$sep = $conf['sep'];
+ $length = 0;
while (false !== $ch = fgetc($fp)) {
+ $length++;
$old = $prev;
$prev = $c;
$c = $ch;
-
+
// Common case
if ($c != $quote && $c != $sep && $c != "\n" && $c != "\r") {
$buff .= $c;
@@ -254,6 +256,7 @@
if ($c == $sep && $prev == $quote && $old != $quote) {
$in_quote = false;
} elseif ($c == $sep && $buff == $quote.$quote) {
+ // In case we are dealing with double quote but empty value
$in_quote = false;
} elseif ($c == "\n" || $c == "\r") {
$sub = ($prev == "\r") ? 2 : 1;