[BUGFIX][Server] DescribeFeature does not clean attribute name

In GML, the attributes have to be cleaned to be used as an XML name.
qgis · Mar 16, 2018 · 6aedf02 · 6aedf02
1 parent 7f4f4e5
commit 6aedf02
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/server/qgswfsprojectparser.cpp b/src/server/qgswfsprojectparser.cpp
@@ -464,7 +464,7 @@ void QgsWFSProjectParser::describeFeatureType( const QString& aTypeName, QDomEle
 
           //xsd:element
           QDomElement attElem = doc.createElement( "element"/*xsd:element*/ );
-          attElem.setAttribute( "name", attributeName );
+          attElem.setAttribute( "name", attributeName.replace( " ", "_" ) );
           QVariant::Type attributeType = fields[idx].type();
           if ( attributeType == QVariant::Int )
             attElem.setAttribute( "type", "integer" );

diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp
@@ -523,6 +523,12 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
           QStringList::const_iterator alstIt;
           QList<int> idxList;
           QgsFields fields = layer->pendingFields();
+          // build corresponding propertyname
+          QList<QString> propertynames;
+          for ( int idx = 0; idx < fields.count(); ++idx )
+          {
+            propertynames.append( fields[idx].name().replace( " ", "_" ) );
+          }
           QString fieldName;
           QDomElement propertyElem;
           for ( int q = 0; q < queryChildNodes.size(); q++ )
@@ -535,7 +541,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
               {
                 fieldName = fieldName.section( ":", 1, 1 );
               }
-              int fieldNameIdx = fields.fieldNameIndex( fieldName );
+              int fieldNameIdx = propertynames.indexOf( fieldName );
               if ( fieldNameIdx > -1 )
               {
                 idxList.append( fieldNameIdx );
@@ -2072,7 +2078,7 @@ QDomElement QgsWFSServer::createFeatureGML2( QgsFeature* feat, QDomDocument& doc
       continue;
     }
 
-    QDomElement fieldElem = doc.createElement( "qgs:" + attributeName.replace( QString( " " ), QString( "_" ) ) );
+    QDomElement fieldElem = doc.createElement( "qgs:" + attributeName.replace( " ", "_" ) );
     QDomText fieldText = doc.createTextNode( featureAttributes[idx].toString() );
     fieldElem.appendChild( fieldText );
     typeNameElement.appendChild( fieldElem );
@@ -2156,7 +2162,7 @@ QDomElement QgsWFSServer::createFeatureGML3( QgsFeature* feat, QDomDocument& doc
       continue;
     }
 
-    QDomElement fieldElem = doc.createElement( "qgs:" + attributeName.replace( QString( " " ), QString( "_" ) ) );
+    QDomElement fieldElem = doc.createElement( "qgs:" + attributeName.replace( " ", "_" ) );
     QDomText fieldText = doc.createTextNode( featureAttributes[idx].toString() );
     fieldElem.appendChild( fieldText );
     typeNameElement.appendChild( fieldElem );