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

Merge pull request #1752 from mhugo/fix_11948

Browse Source 
Test for write access mode for editing capabilities
This commit is contained in:
Matthias Kuhn 2015-01-21 15:30:46 +01:00
commit f5b10ba15f
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/providers/ogr/qgsogrprovider.cpp
View File

@ -268,6 +268,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
, valid( false )
, featuresCounted( -1 )
, mDataModified( false )
, mWriteAccess( false )
{
QgsCPLErrorHandler handler;
@ -368,7 +369,11 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
if ( !openReadOnly )
ogrDataSource = OGROpen( TO8F( mFilePath ), true, &ogrDriver );
if ( !ogrDataSource )
if ( ogrDataSource )
{
mWriteAccess = true;
}
else
{
QgsDebugMsg( "OGR failed to opened in update mode, trying in read-only mode" );
@ -1446,19 +1451,19 @@ int QgsOgrProvider::capabilities() const
ability |= QgsVectorDataProvider::SelectAtId | QgsVectorDataProvider::SelectGeometryAtId;
}
if ( OGR_L_TestCapability( ogrLayer, "SequentialWrite" ) )
if ( mWriteAccess && OGR_L_TestCapability( ogrLayer, "SequentialWrite" ) )
// true if the CreateFeature() method works for this layer.
{
ability |= QgsVectorDataProvider::AddFeatures;
}
if ( OGR_L_TestCapability( ogrLayer, "DeleteFeature" ) )
if ( mWriteAccess && OGR_L_TestCapability( ogrLayer, "DeleteFeature" ) )
// true if this layer can delete its features
{
ability |= DeleteFeatures;
}
if ( OGR_L_TestCapability( ogrLayer, "RandomWrite" ) )
if ( mWriteAccess && OGR_L_TestCapability( ogrLayer, "RandomWrite" ) )
// true if the SetFeature() method is operational on this layer.
{
// TODO According to http://shapelib.maptools.org/ (Shapefile C Library V1.2)
@ -1506,12 +1511,12 @@ int QgsOgrProvider::capabilities() const
}
#endif
if ( OGR_L_TestCapability( ogrLayer, "CreateField" ) )
if ( mWriteAccess && OGR_L_TestCapability( ogrLayer, "CreateField" ) )
{
ability |= AddAttributes;
}
if ( OGR_L_TestCapability( ogrLayer, "DeleteField" ) )
if ( mWriteAccess && OGR_L_TestCapability( ogrLayer, "DeleteField" ) )
{
ability |= DeleteAttributes;
}

3
src/providers/ogr/qgsogrprovider.h
View File

@ -344,6 +344,9 @@ class QgsOgrProvider : public QgsVectorDataProvider
OGRLayerH setSubsetString( OGRLayerH layer, OGRDataSourceH ds );
friend class QgsOgrFeatureSource;
/** whether the file is opened in write mode*/
bool mWriteAccess;
};