cvs: pear /File/File CSV.php

dufuz Fri May 11 21:08:51 2007 UTC

Modified files:
/pear/File/File CSV.php
Log:
Add a little tweak version of patch from Bug #10882
Thanks Cipri

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.33 pear/File/File/CSV.php:1.34
--- pear/File/File/CSV.php:1.33 Sat Apr 28 22:20:24 2007
+++ pear/File/File/CSV.php Fri May 11 21:08:51 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.33 2007/04/28 22:20:24 dufuz Exp $
+ * @version CVS: $Id: CSV.php,v 1.34 2007/05/11 21:08:51 dufuz Exp $
* @link http://pear.php.net/package/File
*/

@@ -497,9 +497,9 @@

// Take the first 30 lines and store the number of ocurrences
// for each separator in each line
- $lines = array();
+ $lines = '';
for ($i = 0; $i < 30 && $line = fgets($fp, 4096); $i++) {
- $lines[] = $line;
+ $lines .= $line;
}
fclose($fp);

@@ -510,11 +510,18 @@
$seps = array("\t", ';', ':', ',');
$seps = array_merge($seps, $extraSeps);
$matches = array();
-
$quotes = '"\'';
+
+ $lines = str_replace('""', '', $lines);
+ while ($lines != ($newLines = preg_replace('|((["\'])[^"]*(\2))|', '\2_\2', $lines))){
+ $lines = $newLines;
+ }
+
+ $lines = explode("\n", $lines);
foreach ($lines as $line) {
- $line = str_replace('""', '', $line);
+ $orgLine = $line;
foreach ($seps as $sep) {
+ $line = preg_replace("|^[^$quotes$sep]*$sep*([$quotes][^$quotes]*[$quotes])|sm", '_', $orgLine);
// Find all seps that are within qoutes
///FIXME ... counts legitimit lines as bad ones