File tree Expand file tree Collapse file tree 2 files changed +8
-10
lines changed Expand file tree Collapse file tree 2 files changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -132,7 +132,7 @@ void QgsOgrProvider::repack()
132
132
QByteArray layerName = OGR_FD_GetName ( OGR_L_GetLayerDefn ( ogrOrigLayer ) );
133
133
134
134
// run REPACK on shape files
135
- if ( mDeletedFeatures )
135
+ if ( mDataModified )
136
136
{
137
137
QByteArray sql = QByteArray ( " REPACK " ) + layerName; // don't quote the layer name as it works with spaces in the name and won't work if the name is quoted
138
138
QgsDebugMsg ( QString ( " SQL: %1" ).arg ( FROM8 ( sql ) ) );
@@ -176,7 +176,7 @@ void QgsOgrProvider::repack()
176
176
}
177
177
}
178
178
179
- mDeletedFeatures = false ;
179
+ mDataModified = false ;
180
180
}
181
181
}
182
182
@@ -267,7 +267,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
267
267
, ogrDriver( 0 )
268
268
, valid( false )
269
269
, featuresCounted( -1 )
270
- , mDeletedFeatures ( false )
270
+ , mDataModified ( false )
271
271
{
272
272
QgsCPLErrorHandler handler;
273
273
@@ -1378,11 +1378,7 @@ bool QgsOgrProvider::deleteFeatures( const QgsFeatureIds & id )
1378
1378
bool returnvalue = true ;
1379
1379
for ( QgsFeatureIds::const_iterator it = id.begin (); it != id.end (); ++it )
1380
1380
{
1381
- if ( deleteFeature ( *it ) )
1382
- {
1383
- mDeletedFeatures = true ;
1384
- }
1385
- else
1381
+ if ( !deleteFeature ( *it ) )
1386
1382
{
1387
1383
returnvalue = false ;
1388
1384
}
@@ -2464,6 +2460,8 @@ bool QgsOgrProvider::syncToDisc()
2464
2460
}
2465
2461
}
2466
2462
2463
+ mDataModified = true ;
2464
+
2467
2465
return true ;
2468
2466
}
2469
2467
Original file line number Diff line number Diff line change @@ -329,8 +329,8 @@ class QgsOgrProvider : public QgsVectorDataProvider
329
329
int geomType;
330
330
long featuresCounted;
331
331
332
- // ! There are deleted feature - REPACK before creating a spatialindex
333
- bool mDeletedFeatures ;
332
+ // ! Data has been modified - REPACK before creating a spatialindex
333
+ bool mDataModified ;
334
334
335
335
mutable QStringList mSubLayerList ;
336
336
You can’t perform that action at this time.
0 commit comments