fix #1941

jef · jef · commit 6d92ae6e3345 · 2009-09-21T19:48:38.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11698 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -116,7 +116,9 @@ QgsVectorFileWriter::QgsVectorFileWriter( const QString& shapefileName,
   QgsDebugMsg( "creating " + QString::number( fields.size() ) + " fields" );
 
   mFields = fields;
+  mAttrIdxToOgrIdx.clear();
 
+  int ogrIdx = 0;
   QgsFieldMap::const_iterator fldIt;
   for ( fldIt = fields.begin(); fldIt != fields.end(); ++fldIt )
   {
@@ -178,6 +180,8 @@ QgsVectorFileWriter::QgsVectorFileWriter( const QString& shapefileName,
       mError = ErrAttributeCreationFailed;
       return;
     }
+
+    mAttrIdxToOgrIdx.insert( fldIt.key(), ogrIdx++ );
   }
 
   QgsDebugMsg( "Done creating fields" );
@@ -218,8 +222,14 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature )
       continue;
     }
 
-    int ogrField = fldIt.key();
-    const QVariant& attrValue = feature.attributeMap()[ ogrField ];
+    if ( !mAttrIdxToOgrIdx.contains( fldIt.key() ) )
+    {
+      QgsDebugMsg( QString( "no ogr field for field %1" ).arg( fldIt.key() ) );
+      continue;
+    }
+
+    const QVariant& attrValue = feature.attributeMap()[ fldIt.key()];
+    int ogrField = mAttrIdxToOgrIdx[ fldIt.key()];
 
     switch ( attrValue.type() )
     {
diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
@@ -98,6 +98,9 @@ class CORE_EXPORT QgsVectorFileWriter
 
     /** geometry type which is being used */
     QGis::WkbType mWkbType;
+
+    /** map attribute indizes to OGR field indexes */
+    QMap<int, int> mAttrIdxToOgrIdx;
 };
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,9 @@ QgsVectorFileWriter::QgsVectorFileWriter( const QString& shapefileName,`
`116`	`116`	`QgsDebugMsg( "creating " + QString::number( fields.size() ) + " fields" );`
`117`	`117`
`118`	`118`	`mFields = fields;`
	`119`	`+ mAttrIdxToOgrIdx.clear();`
`119`	`120`
	`121`	`+ int ogrIdx = 0;`
`120`	`122`	`QgsFieldMap::const_iterator fldIt;`
`121`	`123`	`for ( fldIt = fields.begin(); fldIt != fields.end(); ++fldIt )`
`122`	`124`	`{`
`@@ -178,6 +180,8 @@ QgsVectorFileWriter::QgsVectorFileWriter( const QString& shapefileName,`
`178`	`180`	`mError = ErrAttributeCreationFailed;`
`179`	`181`	`return;`
`180`	`182`	`}`
	`183`	`+`
	`184`	`+ mAttrIdxToOgrIdx.insert( fldIt.key(), ogrIdx++ );`
`181`	`185`	`}`
`182`	`186`
`183`	`187`	`QgsDebugMsg( "Done creating fields" );`
`@@ -218,8 +222,14 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature )`
`218`	`222`	`continue;`
`219`	`223`	`}`
`220`	`224`
`221`		`- int ogrField = fldIt.key();`
`222`		`- const QVariant& attrValue = feature.attributeMap()[ ogrField ];`
	`225`	`+ if ( !mAttrIdxToOgrIdx.contains( fldIt.key() ) )`
	`226`	`+ {`
	`227`	`+ QgsDebugMsg( QString( "no ogr field for field %1" ).arg( fldIt.key() ) );`
	`228`	`+ continue;`
	`229`	`+ }`
	`230`	`+`
	`231`	`+ const QVariant& attrValue = feature.attributeMap()[ fldIt.key()];`
	`232`	`+ int ogrField = mAttrIdxToOgrIdx[ fldIt.key()];`
`223`	`233`
`224`	`234`	`switch ( attrValue.type() )`
`225`	`235`	`{`