fix #1707, take two

jef · jef · commit 80a9cef43612 · 2009-08-19T16:45:20.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11442 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -1241,7 +1241,7 @@ void QgsGrassProvider::setFeatureAttributes( int layerId, int cat, QgsFeature *f
       if ( att != NULL )
       {
         QByteArray cstr( att->values[i] );
-        feature->addAttribute( i, QVariant( mEncoding->toUnicode( cstr ) ) );
+        feature->addAttribute( i, convertValue( mLayers[mLayerId].fields[i].type(), mEncoding->toUnicode( cstr ) ) );
       }
       else   /* it may happen that attributes are missing -> set to empty string */
       {
@@ -1273,7 +1273,7 @@ void QgsGrassProvider::setFeatureAttributes( int layerId, int cat, QgsFeature *f
       if ( att != NULL )
       {
         QByteArray cstr( att->values[*iter] );
-        feature->addAttribute( *iter, QVariant( mEncoding->toUnicode( cstr ) ) );
+        feature->addAttribute( *iter, convertValue( mLayers[mLayerId].fields[*iter].type(), mEncoding->toUnicode( cstr ) ) );
       }
       else   /* it may happen that attributes are missing -> set to empty string */
       {

Original file line number	Diff line number	Diff line change
`@@ -1241,7 +1241,7 @@ void QgsGrassProvider::setFeatureAttributes( int layerId, int cat, QgsFeature *f`
`1241`	`1241`	`if ( att != NULL )`
`1242`	`1242`	`{`
`1243`	`1243`	`QByteArray cstr( att->values[i] );`
`1244`		`- feature->addAttribute( i, QVariant( mEncoding->toUnicode( cstr ) ) );`
	`1244`	`+ feature->addAttribute( i, convertValue( mLayers[mLayerId].fields[i].type(), mEncoding->toUnicode( cstr ) ) );`
`1245`	`1245`	`}`
`1246`	`1246`	`else /* it may happen that attributes are missing -> set to empty string */`
`1247`	`1247`	`{`
`@@ -1273,7 +1273,7 @@ void QgsGrassProvider::setFeatureAttributes( int layerId, int cat, QgsFeature *f`
`1273`	`1273`	`if ( att != NULL )`
`1274`	`1274`	`{`
`1275`	`1275`	`QByteArray cstr( att->values[*iter] );`
`1276`		`- feature->addAttribute( *iter, QVariant( mEncoding->toUnicode( cstr ) ) );`
	`1276`	`+ feature->addAttribute( iter, convertValue( mLayers[mLayerId].fields[iter].type(), mEncoding->toUnicode( cstr ) ) );`
`1277`	`1277`	`}`
`1278`	`1278`	`else /* it may happen that attributes are missing -> set to empty string */`
`1279`	`1279`	`{`