# HG changeset patch
# User Chris Cannam
# Date 1412346422 -3600
# Node ID 1974859baba52e1e8d2c97e0e3d38b20c41a6e20
# Parent  dc1695b90a585e91f4ba5d897d7a302a7bb74c46
Handle variable columns by importing all of them (not just the minimum number)

diff -r dc1695b90a58 -r 1974859baba5 data/fileio/CSVFormat.cpp
--- a/data/fileio/CSVFormat.cpp	Fri Oct 03 15:09:27 2014 +0100
+++ b/data/fileio/CSVFormat.cpp	Fri Oct 03 15:27:02 2014 +0100
@@ -103,7 +103,7 @@
     QStringList list = StringBits::split(line, m_separator[0], m_allowQuoting);
 
     int cols = list.size();
-    if (lineno == 0 || (cols < m_columnCount)) m_columnCount = cols;
+    if (lineno == 0 || (cols > m_columnCount)) m_columnCount = cols;
     if (cols != m_columnCount) m_variableColumnCount = true;
 
     // All columns are regarded as having these qualities until we see