Skip to content

Commit c7f341e

Browse files
committedMay 26, 2012
log OGR errors in QgsVectorFileWriter::addFeature
1 parent 7a29f3c commit c7f341e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed
 

‎src/core/qgsvectorfilewriter.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "qgsfeature.h"
2222
#include "qgsgeometry.h"
2323
#include "qgslogger.h"
24+
#include "qgsmessagelog.h"
2425
#include "qgscoordinatereferencesystem.h"
2526
#include "qgsvectorfilewriter.h"
2627

@@ -468,7 +469,7 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature )
468469
.arg( ogrField )
469470
.arg( QMetaType::typeName( attrValue.type() ) )
470471
.arg( attrValue.toString() );
471-
QgsDebugMsg( mErrorMessage );
472+
QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );
472473
mError = ErrFeatureWriteFailed;
473474
return false;
474475
}
@@ -493,21 +494,21 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature )
493494

494495
if ( !mGeom2 )
495496
{
496-
QgsDebugMsg( QString( "Failed to create empty geometry for type %1 (OGR error: %2)" ).arg( geom->wkbType() ).arg( CPLGetLastErrorMsg() ) );
497497
mErrorMessage = QObject::tr( "Feature geometry not imported (OGR error: %1)" )
498498
.arg( QString::fromUtf8( CPLGetLastErrorMsg() ) );
499499
mError = ErrFeatureWriteFailed;
500+
QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );
500501
OGR_F_Destroy( poFeature );
501502
return false;
502503
}
503504

504505
OGRErr err = OGR_G_ImportFromWkb( mGeom2, geom->asWkb(), geom->wkbSize() );
505506
if ( err != OGRERR_NONE )
506507
{
507-
QgsDebugMsg( QString( "Failed to import geometry from WKB: %1 (OGR error: %2)" ).arg( err ).arg( CPLGetLastErrorMsg() ) );
508508
mErrorMessage = QObject::tr( "Feature geometry not imported (OGR error: %1)" )
509509
.arg( QString::fromUtf8( CPLGetLastErrorMsg() ) );
510510
mError = ErrFeatureWriteFailed;
511+
QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );
511512
OGR_F_Destroy( poFeature );
512513
return false;
513514
}
@@ -520,10 +521,10 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature )
520521
OGRErr err = OGR_G_ImportFromWkb( mGeom, geom->asWkb(), geom->wkbSize() );
521522
if ( err != OGRERR_NONE )
522523
{
523-
QgsDebugMsg( QString( "Failed to import geometry from WKB: %1 (OGR error: %2)" ).arg( err ).arg( CPLGetLastErrorMsg() ) );
524524
mErrorMessage = QObject::tr( "Feature geometry not imported (OGR error: %1)" )
525525
.arg( QString::fromUtf8( CPLGetLastErrorMsg() ) );
526526
mError = ErrFeatureWriteFailed;
527+
QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );
527528
OGR_F_Destroy( poFeature );
528529
return false;
529530
}
@@ -539,7 +540,8 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature )
539540
mErrorMessage = QObject::tr( "Feature creation error (OGR error: %1)" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) );
540541
mError = ErrFeatureWriteFailed;
541542

542-
QgsDebugMsg( mErrorMessage );
543+
QgsMessageLog::logMessage( mErrorMessage, QObject::tr( "OGR" ) );
544+
543545
OGR_F_Destroy( poFeature );
544546
return false;
545547
}

0 commit comments

Comments
 (0)
Please sign in to comment.