server: keep NULL values on featureinfo

jef-n · jef-n · commit 4321c0960b87 · 2015-02-18T18:32:18.000+01:00
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2098,7 +2098,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
         attributeElement.setAttribute( "value",
                                        replaceValueMapAndRelation(
                                          layer, i,
-                                         QgsExpression::replaceExpressionText( featureAttributes[i].toString(), &feature, layer )
+                                         featureAttributes[i].isNull() ?  QString::null : QgsExpression::replaceExpressionText( featureAttributes[i].toString(), &feature, layer )
                                        )
                                      );
         featureElement.appendChild( attributeElement );

Original file line number	Diff line number	Diff line change
`@@ -2098,7 +2098,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,`
`2098`	`2098`	`attributeElement.setAttribute( "value",`
`2099`	`2099`	`replaceValueMapAndRelation(`
`2100`	`2100`	`layer, i,`
`2101`		`- QgsExpression::replaceExpressionText( featureAttributes[i].toString(), &feature, layer )`
	`2101`	`+ featureAttributes[i].isNull() ? QString::null : QgsExpression::replaceExpressionText( featureAttributes[i].toString(), &feature, layer )`
`2102`	`2102`	`)`
`2103`	`2103`	`);`
`2104`	`2104`	`featureElement.appendChild( attributeElement );`