[QGIS Commit] r14890 - trunk/qgis/src/providers/delimitedtext

[svn_qgis at osgeo.org]

Author: gsherman
Date: 2010-12-11 11:11:12 -0800 (Sat, 11 Dec 2010)
New Revision: 14890

Modified:
   trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
   trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h
Log:
Patch for ticket #3320 to fix delimited text plugin crash

Modified: trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
===================================================================
--- trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp	2010-12-11 15:51:25 UTC (rev 14889)
+++ trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp	2010-12-11 19:11:12 UTC (rev 14890)
@@ -134,6 +134,7 @@
 QgsDelimitedTextProvider::QgsDelimitedTextProvider( QString uri )
     : QgsVectorDataProvider( uri )
     , mHasWktField( false )
+	, mFirstDataLine(0)
     , mFieldCount( 0 )
     , mXFieldIndex( -1 ), mYFieldIndex( -1 )
     , mWktFieldIndex( -1 )
@@ -199,7 +200,7 @@
   if ( mFileName.isEmpty() || mDelimiter.isEmpty() )
   {
     // uri is invalid so the layer must be too...
-    QString( "Data source is invalid" );
+    QgsDebugMsg( "Data source is invalid" );
     return;
   }
 
@@ -238,12 +239,13 @@
   {
     lineNumber++;
     line = readLine( mStream ); // line of text excluding '\n', default local 8 bit encoding.
-    if ( line.isEmpty() )
-      continue;
 
     if ( lineNumber < mSkipLines + 1 )
       continue;
 
+    if ( line.isEmpty() )
+      continue;
+
     if ( !hasFields )
     {
       // Get the fields from the header row and store them in the
@@ -297,15 +299,14 @@
     }
     else // hasFields == true - field names already read
     {
+	  if( mFirstDataLine == 0 ) mFirstDataLine = lineNumber;
 
       // split the line on the delimiter
       QStringList parts = splitLine( line );
 
-      // Skip malformed lines silently. Report line number with nextFeature()
-      if ( parts.size() != mFieldCount )
-      {
-        continue;
-      }
+      // Ensure that the input has at least the required number of fields (mainly to tolerate
+	  // missed blank strings at end of row)
+	  while( parts.size() < mFieldCount ) parts.append("");
 
       if ( mHasWktField && mWktFieldIndex >= 0 )
       {
@@ -443,6 +444,8 @@
     // lex the tokens from the current data line
     QStringList tokens = splitLine( line );
 
+	while( tokens.size() < mFieldCount ) tokens.append("");
+
     QgsGeometry *geom = 0;
 
     if ( mHasWktField && mWktFieldIndex >= 0 )
@@ -450,6 +453,8 @@
       try
       {
         QString &sWkt = tokens[mWktFieldIndex];
+		// Remove Z and M coordinates if present, as currently fromWkt doesn't 
+		// support these.
         if ( mWktHasZM )
         {
           sWkt.remove( mWktZMRegexp ).replace( mWktCrdRegexp, "\\1" );
@@ -505,6 +510,7 @@
           i != mAttributesToFetch.end();
           ++i )
     {
+	  
       QString &value = tokens[attributeColumns[*i]];
       QVariant val;
       switch ( attributeFields[*i].type() )
@@ -624,11 +630,10 @@
 {
   // Reset feature id to 0
   mFid = 0;
-  // Skip ahead one line since first record is always assumed to be
-  // the header record
+  // Skip to first data record
   mStream->seek( 0 );
-  int n = mSkipLines + 1;
-  while ( n-- )
+  int n = mFirstDataLine-1;
+  while ( n-- > 0 )
     readLine( mStream );
 }
 

Modified: trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h
===================================================================
--- trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h	2010-12-11 15:51:25 UTC (rev 14889)
+++ trunk/qgis/src/providers/delimitedtext/qgsdelimitedtextprovider.h	2010-12-11 19:11:12 UTC (rev 14890)
@@ -222,6 +222,7 @@
 
     long mNumberFeatures;
     int mSkipLines;
+	int mFirstDataLine; // Actual first line of data (accounting for blank lines)
 
     //! Storage for any lines in the file that couldn't be loaded
     QStringList mInvalidLines;