[QGIS Commit] r13956 - trunk/qgis/src/plugins/wfs

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-07-24 07:24:25 +0000 (Sat, 24 Jul 2010)
New Revision: 13956

Modified:
   trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp
Log:
Apply patch #2891, WFS exception. Thanks to strk

Modified: trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp
===================================================================
--- trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp	2010-07-24 04:13:29 UTC (rev 13955)
+++ trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp	2010-07-24 07:24:25 UTC (rev 13956)
@@ -150,7 +150,8 @@
   QgsHttpTransaction http( request );
   if ( !http.getSynchronously( result ) )
   {
-    QMessageBox::critical( 0, tr( "Could not download capabilities document" ), http.errorString() );
+    QMessageBox::critical( 0, tr( "Error" ),
+      tr( "Could not download capabilities document: " ) + http.errorString() );
     return 1;
   }
 
@@ -158,20 +159,22 @@
   QString capabilitiesDocError;
   if ( !capabilitiesDocument.setContent( result, true, &capabilitiesDocError ) )
   {
-    QMessageBox::critical( 0, tr( "Capabilities document is not valid" ), capabilitiesDocError );
+    QMessageBox::critical( 0, tr( "Error" ),
+      tr( "Capabilities document is not valid: " ) + capabilitiesDocError );
     return 1;
   }
 
-  QDomNodeList exlist = capabilitiesDocument.elementsByTagName( "ExceptionText" );
-  if ( exlist.length() )
+  QDomElement doc = capabilitiesDocument.documentElement();
+  if ( doc.tagName() == "ExceptionReport" )
   {
-    QDomElement ex = exlist.at( 0 ).toElement();
-    QMessageBox::critical( 0, tr( "Error" ), ex.firstChild().nodeValue() );
+    QDomNode ex = doc.firstChild();
+    QString exc = ex.toElement().attribute("exceptionCode", "Exception");
+    QDomElement ext = ex.firstChild().toElement();
+    QMessageBox::critical( 0, tr( "Error" ),
+      exc + ": " + ext.firstChild().nodeValue() );
     return 1;
   }
 
-
-
   //get the <FeatureType> elements
   QDomNodeList featureTypeList = capabilitiesDocument.elementsByTagNameNS( WFS_NAMESPACE, "FeatureType" );
   for ( unsigned int i = 0; i < featureTypeList.length(); ++i )