sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make expression functions that use internal requests more stable

Browse Source
This commit is contained in:
Matthias Kuhn 2018-08-02 13:34:26 +02:00
parent 14643ad98d
commit 5252bf1954
No known key found for this signature in database
GPG Key ID: A0E766808764D73F
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/expression/qgsexpressionfunction.cpp
View File

@ -3569,6 +3569,8 @@ static QVariant fcnGetFeatureById( const QVariantList &values, const QgsExpressi
QgsFeatureRequest req; QgsFeatureRequest req;
req.setFilterFid( fid ); req.setFilterFid( fid );
req.setConnectionTimeout( 10000 );
req.setFreeConnectionsRequirement( 1 );
QgsFeatureIterator fIt = vl->getFeatures( req ); QgsFeatureIterator fIt = vl->getFeatures( req );
QgsFeature fet; QgsFeature fet;
@ -3609,6 +3611,8 @@ static QVariant fcnGetFeature( const QVariantList &values, const QgsExpressionCo
req.setFilterExpression( QStringLiteral( "%1=%2" ).arg( QgsExpression::quotedColumnRef( attribute ), req.setFilterExpression( QStringLiteral( "%1=%2" ).arg( QgsExpression::quotedColumnRef( attribute ),
QgsExpression::quotedString( attVal.toString() ) ) ); QgsExpression::quotedString( attVal.toString() ) ) );
req.setLimit( 1 ); req.setLimit( 1 );
req.setConnectionTimeout( 10000 );
req.setFreeConnectionsRequirement( 1 );
if ( !parent->needsGeometry() ) if ( !parent->needsGeometry() )
{ {
req.setFlags( QgsFeatureRequest::NoGeometry ); req.setFlags( QgsFeatureRequest::NoGeometry );