[WFS provider] Force refresh of GetCapabilities when pressing Connect

rouault · rouault · commit b8ff71af4671 · 2016-10-06T18:44:35.000+02:00
The cached response to GetCapabilities was always used, even when pressing Connect. Now a new request is sent over the network. Fixes #15647
diff --git a/src/providers/wfs/qgswfscapabilities.cpp b/src/providers/wfs/qgswfscapabilities.cpp
@@ -35,7 +35,7 @@ QgsWfsCapabilities::~QgsWfsCapabilities()
 {
 }
 
-bool QgsWfsCapabilities::requestCapabilities( bool synchronous )
+bool QgsWfsCapabilities::requestCapabilities( bool synchronous, bool forceRefresh )
 {
   QUrl url( baseURL() );
   url.addQueryItem( "REQUEST", "GetCapabilities" );
@@ -47,7 +47,7 @@ bool QgsWfsCapabilities::requestCapabilities( bool synchronous )
   else
     url.addQueryItem( "VERSION", version );
 
-  if ( !sendGET( url, synchronous, false ) )
+  if ( !sendGET( url, synchronous, forceRefresh ) )
   {
     emit gotCapabilities();
     return false;
diff --git a/src/providers/wfs/qgswfscapabilities.h b/src/providers/wfs/qgswfscapabilities.h
@@ -30,7 +30,7 @@ class QgsWfsCapabilities : public QgsWfsRequest
     virtual ~QgsWfsCapabilities();
 
     //! start network connection to get capabilities
-    bool requestCapabilities( bool synchronous );
+    bool requestCapabilities( bool synchronous, bool forceRefresh );
 
     //! description of a vector layer
     struct FeatureType
diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp
@@ -62,7 +62,9 @@ QVector<QgsDataItem*> QgsWfsConnectionItem::createChildren()
 
   QgsWfsCapabilities capabilities( mUri );
 
-  capabilities.requestCapabilities( true );
+  const bool synchronous = true;
+  const bool forceRefresh = false;
+  capabilities.requestCapabilities( synchronous, forceRefresh );
 
   QVector<QgsDataItem*> layers;
   if ( capabilities.errorCode() == QgsWfsCapabilities::NoError )
diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -1437,7 +1437,9 @@ bool QgsWFSProvider::getCapabilities()
   if ( mShared->mCaps.version.isEmpty() )
   {
     QgsWfsCapabilities getCapabilities( mShared->mURI.uri( false ) );
-    if ( !getCapabilities.requestCapabilities( true ) )
+    const bool synchronous = true;
+    const bool forceRefresh = false;
+    if ( !getCapabilities.requestCapabilities( synchronous, forceRefresh ) )
     {
       QgsMessageLog::logMessage( tr( "GetCapabilities failed for url %1: %2" ).
                                  arg( dataSourceUri() ).arg( getCapabilities.errorMessage() ), tr( "WFS" ) );
diff --git a/src/providers/wfs/qgswfssourceselect.cpp b/src/providers/wfs/qgswfssourceselect.cpp
@@ -353,7 +353,9 @@ void QgsWFSSourceSelect::connectToServer()
   }
   if ( mCapabilities )
   {
-    mCapabilities->requestCapabilities( false );
+    const bool synchronous = false;
+    const bool forceRefresh = true;
+    mCapabilities->requestCapabilities( synchronous, forceRefresh );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ QgsWfsCapabilities::~QgsWfsCapabilities()`
`35`	`35`	`{`
`36`	`36`	`}`
`37`	`37`
`38`		`-bool QgsWfsCapabilities::requestCapabilities( bool synchronous )`
	`38`	`+bool QgsWfsCapabilities::requestCapabilities( bool synchronous, bool forceRefresh )`
`39`	`39`	`{`
`40`	`40`	`QUrl url( baseURL() );`
`41`	`41`	`url.addQueryItem( "REQUEST", "GetCapabilities" );`
`@@ -47,7 +47,7 @@ bool QgsWfsCapabilities::requestCapabilities( bool synchronous )`
`47`	`47`	`else`
`48`	`48`	`url.addQueryItem( "VERSION", version );`
`49`	`49`
`50`		`- if ( !sendGET( url, synchronous, false ) )`
	`50`	`+ if ( !sendGET( url, synchronous, forceRefresh ) )`
`51`	`51`	`{`
`52`	`52`	`emit gotCapabilities();`
`53`	`53`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -1437,7 +1437,9 @@ bool QgsWFSProvider::getCapabilities()`
`1437`	`1437`	`if ( mShared->mCaps.version.isEmpty() )`
`1438`	`1438`	`{`
`1439`	`1439`	`QgsWfsCapabilities getCapabilities( mShared->mURI.uri( false ) );`
`1440`		`- if ( !getCapabilities.requestCapabilities( true ) )`
	`1440`	`+ const bool synchronous = true;`
	`1441`	`+ const bool forceRefresh = false;`
	`1442`	`+ if ( !getCapabilities.requestCapabilities( synchronous, forceRefresh ) )`
`1441`	`1443`	`{`
`1442`	`1444`	`QgsMessageLog::logMessage( tr( "GetCapabilities failed for url %1: %2" ).`
`1443`	`1445`	`arg( dataSourceUri() ).arg( getCapabilities.errorMessage() ), tr( "WFS" ) );`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,9 @@ void QgsWFSSourceSelect::connectToServer()`
`353`	`353`	`}`
`354`	`354`	`if ( mCapabilities )`
`355`	`355`	`{`
`356`		`- mCapabilities->requestCapabilities( false );`
	`356`	`+ const bool synchronous = false;`
	`357`	`+ const bool forceRefresh = true;`
	`358`	`+ mCapabilities->requestCapabilities( synchronous, forceRefresh );`
`357`	`359`	`}`
`358`	`360`	`}`
`359`	`361`