[WFS provider] Display appropriate error message when using a non exi…

…sting typename
qgis · Jun 6, 2016 · 3acbe71 · 3acbe71
1 parent 021da12
commit 3acbe71
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -311,7 +311,14 @@ bool QgsWFSProvider::processSQL( const QString& sqlString, QString& errorMsg )
     QString prefixedTypename( mShared->mCaps.addPrefixIfNeeded( table->name() ) );
     if ( prefixedTypename.isEmpty() )
     {
-      errorMsg = tr( "Typename '%1' is ambiguous without prefix" ).arg( table->name() );
+      if ( mShared->mCaps.setAmbiguousUnprefixedTypename.contains( table->name() ) )
+      {
+        errorMsg = tr( "Typename '%1' is ambiguous without prefix" ).arg( table->name() );
+      }
+      else
+      {
+        errorMsg = tr( "Typename '%1' is unknown" ).arg( table->name() );
+      }
       return false;
     }
     typenameList << prefixedTypename;
@@ -339,7 +346,14 @@ bool QgsWFSProvider::processSQL( const QString& sqlString, QString& errorMsg )
     QString prefixedTypename( mShared->mCaps.addPrefixIfNeeded( table->name() ) );
     if ( prefixedTypename.isEmpty() )
     {
-      errorMsg = tr( "Typename '%1' is ambiguous without prefix" ).arg( table->name() );
+      if ( mShared->mCaps.setAmbiguousUnprefixedTypename.contains( table->name() ) )
+      {
+        errorMsg = tr( "Typename '%1' is ambiguous without prefix" ).arg( table->name() );
+      }
+      else
+      {
+        errorMsg = tr( "Typename '%1' is unknown" ).arg( table->name() );
+      }
       return false;
     }
     typenameList << prefixedTypename;