also report provider errors when not debugging

jef · jef · commit ff198a85d108 · 2010-09-25T14:21:50.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14281 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -58,7 +58,7 @@ class QgsCPLErrorHandler
 {
     static void CPL_STDCALL showError( CPLErr errClass, int errNo, const char *msg )
     {
-      QgsDebugMsg( QString( "OGR[%1] error %2: %3" ).arg( errClass ).arg( errNo ).arg( msg ) );
+      QgsLogger::warning( QString( "OGR[%1] error %2: %3" ).arg( errClass ).arg( errNo ).arg( msg ) );
     }
 
   public:
@@ -71,7 +71,6 @@ class QgsCPLErrorHandler
     {
       CPLPopErrorHandler();
     }
-
 };
 
 QgsOgrProvider::QgsOgrProvider( QString const & uri )
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -623,7 +623,7 @@ bool QgsPostgresProvider::nextFeature( QgsFeature& feature )
     QString fetch = QString( "fetch forward %1 from %2" ).arg( mFeatureQueueSize ).arg( cursorName );
     if ( connectionRO->PQsendQuery( fetch ) == 0 ) // fetch features asynchronously
     {
-      QgsDebugMsg( "PQsendQuery failed" );
+      QgsLogger::warning( "PQsendQuery failed" );
     }
 
     Result queryResult;
@@ -758,7 +758,7 @@ const QgsField &QgsPostgresProvider::field( int index ) const
 
   if ( it == attributeFields.constEnd() )
   {
-    QgsDebugMsg( "Field " + QString::number( index ) + " not found." );
+    QgsLogger::warning( "Field " + QString::number( index ) + " not found." );
     throw PGFieldNotFound();
   }
 
@@ -924,7 +924,7 @@ bool QgsPostgresProvider::loadFields()
       }
       else
       {
-        QgsDebugMsg( "Field " + fieldName + " ignored, because of unsupported type " + fieldTypeName );
+        QgsLogger::warning( "Field " + fieldName + " ignored, because of unsupported type " + fieldTypeName );
         continue;
       }
 
@@ -943,7 +943,7 @@ bool QgsPostgresProvider::loadFields()
     }
     else
     {
-      QgsDebugMsg( "Field " + fieldName + " ignored, because of unsupported type type " + fieldTType );
+      QgsLogger::warning( "Field " + fieldName + " ignored, because of unsupported type type " + fieldTType );
       continue;
     }
 
@@ -3307,13 +3307,11 @@ bool QgsPostgresProvider::Conn::PQexecNR( QString query )
   if ( errorStatus == PGRES_COMMAND_OK )
     return true;
 
-#ifdef QGISDEBUG
-  QString err = QString( "Query: %1 returned %2 [%3]" )
-                .arg( query )
-                .arg( errorStatus )
-                .arg( QString::fromUtf8( PQresultErrorMessage( res ) ) );
-  QgsDebugMsg( err );
-#endif
+  QgsLogger::warning( QString( "Query: %1 returned %2 [%3]" )
+                      .arg( query )
+                      .arg( errorStatus )
+                      .arg( QString::fromUtf8( PQresultErrorMessage( res ) ) ) );
+
   if ( openCursors )
   {
     QgsPostgresProvider::showMessageBox(

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class QgsCPLErrorHandler`
`58`	`58`	`{`
`59`	`59`	`static void CPL_STDCALL showError( CPLErr errClass, int errNo, const char *msg )`
`60`	`60`	`{`
`61`		`- QgsDebugMsg( QString( "OGR[%1] error %2: %3" ).arg( errClass ).arg( errNo ).arg( msg ) );`
	`61`	`+ QgsLogger::warning( QString( "OGR[%1] error %2: %3" ).arg( errClass ).arg( errNo ).arg( msg ) );`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public:`
`@@ -71,7 +71,6 @@ class QgsCPLErrorHandler`
`71`	`71`	`{`
`72`	`72`	`CPLPopErrorHandler();`
`73`	`73`	`}`
`74`		`-`
`75`	`74`	`};`
`76`	`75`
`77`	`76`	`QgsOgrProvider::QgsOgrProvider( QString const & uri )`
Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ bool QgsPostgresProvider::nextFeature( QgsFeature& feature )`
`623`	`623`	`QString fetch = QString( "fetch forward %1 from %2" ).arg( mFeatureQueueSize ).arg( cursorName );`
`624`	`624`	`if ( connectionRO->PQsendQuery( fetch ) == 0 ) // fetch features asynchronously`
`625`	`625`	`{`
`626`		`- QgsDebugMsg( "PQsendQuery failed" );`
	`626`	`+ QgsLogger::warning( "PQsendQuery failed" );`
`627`	`627`	`}`
`628`	`628`
`629`	`629`	`Result queryResult;`
`@@ -758,7 +758,7 @@ const QgsField &QgsPostgresProvider::field( int index ) const`
`758`	`758`
`759`	`759`	`if ( it == attributeFields.constEnd() )`
`760`	`760`	`{`
`761`		`- QgsDebugMsg( "Field " + QString::number( index ) + " not found." );`
	`761`	`+ QgsLogger::warning( "Field " + QString::number( index ) + " not found." );`
`762`	`762`	`throw PGFieldNotFound();`
`763`	`763`	`}`
`764`	`764`
`@@ -924,7 +924,7 @@ bool QgsPostgresProvider::loadFields()`
`924`	`924`	`}`
`925`	`925`	`else`
`926`	`926`	`{`
`927`		`- QgsDebugMsg( "Field " + fieldName + " ignored, because of unsupported type " + fieldTypeName );`
	`927`	`+ QgsLogger::warning( "Field " + fieldName + " ignored, because of unsupported type " + fieldTypeName );`
`928`	`928`	`continue;`
`929`	`929`	`}`
`930`	`930`
`@@ -943,7 +943,7 @@ bool QgsPostgresProvider::loadFields()`
`943`	`943`	`}`
`944`	`944`	`else`
`945`	`945`	`{`
`946`		`- QgsDebugMsg( "Field " + fieldName + " ignored, because of unsupported type type " + fieldTType );`
	`946`	`+ QgsLogger::warning( "Field " + fieldName + " ignored, because of unsupported type type " + fieldTType );`
`947`	`947`	`continue;`
`948`	`948`	`}`
`949`	`949`
`@@ -3307,13 +3307,11 @@ bool QgsPostgresProvider::Conn::PQexecNR( QString query )`
`3307`	`3307`	`if ( errorStatus == PGRES_COMMAND_OK )`
`3308`	`3308`	`return true;`
`3309`	`3309`
`3310`		`-#ifdef QGISDEBUG`
`3311`		`- QString err = QString( "Query: %1 returned %2 [%3]" )`
`3312`		`- .arg( query )`
`3313`		`- .arg( errorStatus )`
`3314`		`- .arg( QString::fromUtf8( PQresultErrorMessage( res ) ) );`
`3315`		`- QgsDebugMsg( err );`
`3316`		`-#endif`
	`3310`	`+ QgsLogger::warning( QString( "Query: %1 returned %2 [%3]" )`
	`3311`	`+ .arg( query )`
	`3312`	`+ .arg( errorStatus )`
	`3313`	`+ .arg( QString::fromUtf8( PQresultErrorMessage( res ) ) ) );`
	`3314`	`+`
`3317`	`3315`	`if ( openCursors )`
`3318`	`3316`	`{`
`3319`	`3317`	`QgsPostgresProvider::showMessageBox(`