server getfeatureinfo: restore quoting in plain/text format

jef-n · jef-n · commit b3bd32ff9601 · 2015-02-16T11:10:25.000+01:00
diff --git a/src/server/qgshttprequesthandler.cpp b/src/server/qgshttprequesthandler.cpp
@@ -368,8 +368,8 @@ void QgsHttpRequestHandler::setGetFeatureInfoResponse( const QDomDocument& infoD
             QDomElement attributeElement = attributeNodeList.at( k ).toElement();
             if ( infoFormat == "text/plain" )
             {
-              featureInfoString.append( attributeElement.attribute( "name" ) + " = " +
-                                        attributeElement.attribute( "value" ) + "\n" );
+              featureInfoString.append( attributeElement.attribute( "name" ) + " = '" +
+                                        attributeElement.attribute( "value" ) + "'\n" );
             }
             else if ( infoFormat == "text/html" )
             {
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2101,16 +2101,6 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
         else
         {
           value = replaceValueMapAndRelation( layer, i, QgsExpression::replaceExpressionText( featureAttributes[i].toString(), &feature, layer ) );
-
-          switch ( featureAttributes[i].type() )
-          {
-            case QVariant::Int:
-            case QVariant::LongLong:
-            case QVariant::Double:
-              break;
-            default:
-              value = "'" + value + "'";
-          }
         }
 
         attributeElement.setAttribute( "value",  value );

Original file line number	Diff line number	Diff line change
`@@ -368,8 +368,8 @@ void QgsHttpRequestHandler::setGetFeatureInfoResponse( const QDomDocument& infoD`
`368`	`368`	`QDomElement attributeElement = attributeNodeList.at( k ).toElement();`
`369`	`369`	`if ( infoFormat == "text/plain" )`
`370`	`370`	`{`
`371`		`- featureInfoString.append( attributeElement.attribute( "name" ) + " = " +`
`372`		`- attributeElement.attribute( "value" ) + "\n" );`
	`371`	`+ featureInfoString.append( attributeElement.attribute( "name" ) + " = '" +`
	`372`	`+ attributeElement.attribute( "value" ) + "'\n" );`
`373`	`373`	`}`
`374`	`374`	`else if ( infoFormat == "text/html" )`
`375`	`375`	`{`