[BUGFIX][Server] Filter restorer modifying layers and not well restoring them

rldhont · rldhont · commit c869fa29b6d8 · 2017-04-25T18:03:28.000+02:00
The Subsetstring is updated through QgsVectorLayer::setSubsetString and restored by QgsVectorDataProvider::setSubsetString and it's not idempotent.
The solution is to use QgsVectorLayer::setSubsetString in the 2 cases.
diff --git a/src/server/qgsfilterrestorer.cpp b/src/server/qgsfilterrestorer.cpp
@@ -61,10 +61,9 @@ void QgsOWSServerFilterRestorer::restoreLayerFilters( const QHash<QgsMapLayer *,
     QgsVectorLayer *filteredLayer = qobject_cast<QgsVectorLayer *>( filterIt.key() );
     if ( filteredLayer )
     {
-      QgsVectorDataProvider *dp = filteredLayer->dataProvider();
-      if ( dp )
+      if ( !filteredLayer->setSubsetString( filterIt.value() ) )
       {
-        dp->setSubsetString( filterIt.value() );
+        QgsMessageLog::logMessage( QStringLiteral( "Layer does not support Subset String" ) );
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,9 @@ void QgsOWSServerFilterRestorer::restoreLayerFilters( const QHash<QgsMapLayer *,`
`61`	`61`	`QgsVectorLayer filteredLayer = qobject_cast<QgsVectorLayer >( filterIt.key() );`
`62`	`62`	`if ( filteredLayer )`
`63`	`63`	`{`
`64`		`- QgsVectorDataProvider *dp = filteredLayer->dataProvider();`
`65`		`- if ( dp )`
	`64`	`+ if ( !filteredLayer->setSubsetString( filterIt.value() ) )`
`66`	`65`	`{`
`67`		`- dp->setSubsetString( filterIt.value() );`
	`66`	`+ QgsMessageLog::logMessage( QStringLiteral( "Layer does not support Subset String" ) );`
`68`	`67`	`}`
`69`	`68`	`}`
`70`	`69`	`}`