WMS server: Use ; as separator in case of multiple selection for value relations

Author: mhugent

src/mapserver/qgswmsserver.cpp

@@ -2887,42 +2887,16 @@ QString QgsWMSServer::replaceValueMapAndRelation( QgsVectorLayer* vl, int idx, c
     {
       QString valueString = attributeVal;
       QStringList valueList = valueString.remove( QChar( '{' ) ).remove( QChar( '}' ) ).split( "," );
-      outputString += "{";
       for ( int i = 0; i < valueList.size(); ++i )
       {
         if ( i > 0 )
         {
-          outputString += ",";
+          outputString += ";";
         }
         outputString += relationValue( valueList.at( i ), layer, vrdata.mKey, vrdata.mValue );
       }
-      outputString += "}";
     }
-    else
-    {
-      outputString = relationValue( attributeVal, layer, vrdata.mKey, vrdata.mValue );
-    }
-
     return outputString;
-
-    /*
-    int keyId = layer->fieldNameIndex( vrdata.mKey );
-    int valueId = layer->fieldNameIndex( vrdata.mValue );
-    if ( keyId == -1 || valueId == -1 )
-    {
-      return attributeVal;
-    }
-
-    QgsFeatureIterator fIt = layer->getFeatures( QgsFeatureRequest().setFlags( QgsFeatureRequest::NoGeometry ).setSubsetOfAttributes( QgsAttributeList() << keyId << valueId ) );
-    QgsFeature f;
-    while ( fIt.nextFeature( f ) )
-    {
-      if ( f.attribute( vrdata.mKey ).toString() == attributeVal )
-      {
-        return f.attribute( vrdata.mValue ).toString();
-      }
-    }*/
-
   }
   return attributeVal;
 }