fix attribute mapping in vector layer import

jef-n · jef-n · commit f00d00410445 · 2013-01-30T23:20:37.000+01:00
diff --git a/python/plugins/db_manager/dlg_import_vector.py b/python/plugins/db_manager/dlg_import_vector.py
@@ -310,7 +310,10 @@ def accept(self):
 			QApplication.restoreOverrideCursor()
 
 		if ret != 0:
-			QMessageBox.warning(self, "Import to database", u"Error %d\n%s" % (ret, errMsg) )
+			output = qgis.gui.QgsMessageViewer()
+			output.setTitle( "Import to database" )
+			output.setMessageAsPlainText( u"Error %d\n%s" % (ret, errMsg) )
+			output.showMessage()
 			return
 
 		# create spatial index
diff --git a/src/core/qgsvectorlayerimport.cpp b/src/core/qgsvectorlayerimport.cpp
@@ -85,6 +85,16 @@ QgsVectorLayerImport::QgsVectorLayerImport( const QString &uri,
     return;
   }
 
+  mAttributeCount = -1;
+
+  foreach ( int idx, mOldToNewAttrIdx.values() )
+  {
+    if ( idx > mAttributeCount )
+      mAttributeCount = idx;
+  }
+
+  mAttributeCount++;
+
   QgsDebugMsg( "Created empty layer" );
 
   QgsVectorDataProvider *vectorProvider = ( QgsVectorDataProvider* ) pReg->provider( providerKey, uri );
@@ -128,17 +138,19 @@ bool QgsVectorLayerImport::addFeature( QgsFeature& feat )
   QgsFeature newFeat;
   if ( feat.geometry() )
     newFeat.setGeometry( *feat.geometry() );
-  newFeat.initAttributes( attrs.count() );
+
+  newFeat.initAttributes( mAttributeCount );
 
   for ( int i = 0; i < attrs.count(); ++i )
   {
     // add only mapped attributes (un-mapped ones will not be present in the
     // destination layer)
-    if ( mOldToNewAttrIdx.contains( i ) )
-    {
-      QgsDebugMsgLevel( QString( "moving field from pos %1 to %2" ).arg( i ).arg( mOldToNewAttrIdx.value( i ) ), 3 );
-      newFeat.setAttribute( mOldToNewAttrIdx.value( i ), attrs[i] );
-    }
+    int dstIdx = mOldToNewAttrIdx.value( i, -1 );
+    if ( dstIdx < 0 )
+      continue;
+
+    QgsDebugMsgLevel( QString( "moving field from pos %1 to %2" ).arg( i ).arg( dstIdx ), 3 );
+    newFeat.setAttribute( dstIdx, attrs[i] );
   }
 
   mFeatureBuffer.append( newFeat );
diff --git a/src/core/qgsvectorlayerimport.h b/src/core/qgsvectorlayerimport.h
@@ -107,6 +107,7 @@ class CORE_EXPORT QgsVectorLayerImport
 
     /** map attribute indexes to new field indexes */
     QMap<int, int> mOldToNewAttrIdx;
+    int mAttributeCount;
 
     QgsFeatureList mFeatureBuffer;
     QProgressDialog *mProgress;
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -1820,7 +1820,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(
 
   if ( fields.size() > 0 )
   {
-    int offset = geometryColumn.isEmpty() ? 0 : 1;
+    int offset = 0;
 
     // get the list of fields
     QList<QgsField> flist;
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2992,7 +2992,7 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(
 
   if ( fields.size() > 0 )
   {
-    int offset = geometryColumn.isEmpty() ? 1 : 2;
+    int offset = 1;
 
     // get the list of fields
     QList<QgsField> flist;

Original file line number	Diff line number	Diff line change
`@@ -1820,7 +1820,7 @@ QgsVectorLayerImport::ImportError QgsMssqlProvider::createEmptyLayer(`
`1820`	`1820`
`1821`	`1821`	`if ( fields.size() > 0 )`
`1822`	`1822`	`{`
`1823`		`- int offset = geometryColumn.isEmpty() ? 0 : 1;`
	`1823`	`+ int offset = 0;`
`1824`	`1824`
`1825`	`1825`	`// get the list of fields`
`1826`	`1826`	`QList<QgsField> flist;`
Original file line number	Diff line number	Diff line change
`@@ -2992,7 +2992,7 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(`
`2992`	`2992`
`2993`	`2993`	`if ( fields.size() > 0 )`
`2994`	`2994`	`{`
`2995`		`- int offset = geometryColumn.isEmpty() ? 1 : 2;`
	`2995`	`+ int offset = 1;`
`2996`	`2996`
`2997`	`2997`	`// get the list of fields`
`2998`	`2998`	`QList<QgsField> flist;`