[QGIS Commit] r13935 - trunk/qgis/src/plugins/wfs
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Jul 19 05:07:06 EDT 2010
Author: mhugent
Date: 2010-07-19 09:07:06 +0000 (Mon, 19 Jul 2010)
New Revision: 13935
Modified:
trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp
Log:
Apply patch in ticket #2891 and some more verbose error reporting. Thanks strk
Modified: trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp
===================================================================
--- trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp 2010-07-19 06:21:39 UTC (rev 13934)
+++ trunk/qgis/src/plugins/wfs/qgswfssourceselect.cpp 2010-07-19 09:07:06 UTC (rev 13935)
@@ -90,7 +90,7 @@
QSettings s;
QString selectedConnection = s.value( "/Qgis/connections-wfs/selected" ).toString();
int index = cmbConnections->findText( selectedConnection );
- if( index != -1 )
+ if ( index != -1 )
{
cmbConnections->setCurrentIndex( index );
}
@@ -150,17 +150,28 @@
QgsHttpTransaction http( request );
if ( !http.getSynchronously( result ) )
{
- QMessageBox::critical( 0, tr( "Error" ), tr( "The capabilities document could not be retrieved from the server" ) );
+ QMessageBox::critical( 0, tr( "Could not download capabilities document" ), http.errorString() );
+ return 1;
}
QDomDocument capabilitiesDocument;
- if ( !capabilitiesDocument.setContent( result, true ) )
+ QString capabilitiesDocError;
+ if ( !capabilitiesDocument.setContent( result, true, &capabilitiesDocError ) )
{
- return 1; //error
+ QMessageBox::critical( 0, tr( "Capabilities document is not valid" ), capabilitiesDocError );
+ return 1;
}
+ QDomNodeList exlist = capabilitiesDocument.elementsByTagName( "ExceptionText" );
+ if ( exlist.length() )
+ {
+ QDomElement ex = exlist.at( 0 ).toElement();
+ QMessageBox::critical( 0, tr( "Error" ), ex.firstChild().nodeValue() );
+ return 1;
+ }
+
//get the <FeatureType> elements
QDomNodeList featureTypeList = capabilitiesDocument.elementsByTagNameNS( WFS_NAMESPACE, "FeatureType" );
for ( unsigned int i = 0; i < featureTypeList.length(); ++i )
More information about the QGIS-commit
mailing list