wms identify: report error if features types were guessed from GML but no features parsed

blazek · blazek · commit ee236d2d6c25 · 2014-02-13T11:00:15.000+01:00
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -4578,6 +4578,16 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs
         featureStoreList.append( featureStore );
         delete coordinateTransform;
       }
+      // It is suspicious if we guessed feature types from GML but could not get
+      // features from it. Either we geuessed wrong schema or parsing features failed.
+      // Report it as error so that user can switch to another format in results dialog.
+      if ( xsdPart < 0 && !featureTypeNames.isEmpty() && featureStoreList.isEmpty() )
+      {
+        QgsError err = ERROR( tr( "Cannot identify" ) );
+        err.append( tr( "Result parsing failed. %1 feature types were guessed from gml (%2) but no features were parsed." ).arg( featureTypeNames.size() ).arg( featureTypeNames.join( "," ) ) );
+        QgsDebugMsg( "parsing GML error: " +  err.message() );
+        return QgsRasterIdentifyResult( err );
+      }
       results.insert( count, qVariantFromValue( featureStoreList ) );
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -4578,6 +4578,16 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPoint & thePoint, Qgs`
`4578`	`4578`	`featureStoreList.append( featureStore );`
`4579`	`4579`	`delete coordinateTransform;`
`4580`	`4580`	`}`
	`4581`	`+ // It is suspicious if we guessed feature types from GML but could not get`
	`4582`	`+ // features from it. Either we geuessed wrong schema or parsing features failed.`
	`4583`	`+ // Report it as error so that user can switch to another format in results dialog.`
	`4584`	`+ if ( xsdPart < 0 && !featureTypeNames.isEmpty() && featureStoreList.isEmpty() )`
	`4585`	`+ {`
	`4586`	`+ QgsError err = ERROR( tr( "Cannot identify" ) );`
	`4587`	`+ err.append( tr( "Result parsing failed. %1 feature types were guessed from gml (%2) but no features were parsed." ).arg( featureTypeNames.size() ).arg( featureTypeNames.join( "," ) ) );`
	`4588`	`+ QgsDebugMsg( "parsing GML error: " + err.message() );`
	`4589`	`+ return QgsRasterIdentifyResult( err );`
	`4590`	`+ }`
`4581`	`4591`	`results.insert( count, qVariantFromValue( featureStoreList ) );`
`4582`	`4592`	`}`
`4583`	`4593`	`}`