Fix WFS loading with geoserver layers

mhugent · mhugent · commit 0e9717ba4b77 · 2013-02-20T21:54:08.000+01:00
diff --git a/src/core/qgsgml.cpp b/src/core/qgsgml.cpp
@@ -188,9 +188,7 @@ void QgsGml::startElement( const XML_Char* el, const XML_Char** attr )
     mParseModeStack.push( QgsGml::boundingBox );
   }
   else if ( elementName == GML_NAMESPACE + NS_SEPARATOR + "featureMember" )
-  {
-  }
-  else if ( localName == mTypeName )
+    //else if ( localName == mTypeName )
   {
     mCurrentFeature = new QgsFeature( mFeatureCount );
     QgsAttributes attributes( mThematicAttributes.size() ); //add empty attributes
@@ -308,8 +306,8 @@ void QgsGml::endElement( const XML_Char* el )
       mParseModeStack.pop();
     }
   }
-  //else if ( elementName == GML_NAMESPACE + NS_SEPARATOR + "featureMember" )
-  else if ( localName == mTypeName )
+  //else if ( localName == mTypeName )
+  else if ( elementName == GML_NAMESPACE + NS_SEPARATOR + "featureMember" )
   {
     if ( mCurrentWKBSize > 0 )
     {

Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,7 @@ void QgsGml::startElement( const XML_Char* el, const XML_Char** attr )`
`188`	`188`	`mParseModeStack.push( QgsGml::boundingBox );`
`189`	`189`	`}`
`190`	`190`	`else if ( elementName == GML_NAMESPACE + NS_SEPARATOR + "featureMember" )`
`191`		`- {`
`192`		`- }`
`193`		`- else if ( localName == mTypeName )`
	`191`	`+ //else if ( localName == mTypeName )`
`194`	`192`	`{`
`195`	`193`	`mCurrentFeature = new QgsFeature( mFeatureCount );`
`196`	`194`	`QgsAttributes attributes( mThematicAttributes.size() ); //add empty attributes`
`@@ -308,8 +306,8 @@ void QgsGml::endElement( const XML_Char* el )`
`308`	`306`	`mParseModeStack.pop();`
`309`	`307`	`}`
`310`	`308`	`}`
`311`		`- //else if ( elementName == GML_NAMESPACE + NS_SEPARATOR + "featureMember" )`
`312`		`- else if ( localName == mTypeName )`
	`309`	`+ //else if ( localName == mTypeName )`
	`310`	`+ else if ( elementName == GML_NAMESPACE + NS_SEPARATOR + "featureMember" )`
`313`	`311`	`{`
`314`	`312`	`if ( mCurrentWKBSize > 0 )`
`315`	`313`	`{`