[QGIS Commit] r14281 - in trunk/qgis/src/providers: ogr postgres

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-09-25 14:21:50 +0000 (Sat, 25 Sep 2010)
New Revision: 14281

Modified:
   trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
   trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
Log:
also report provider errors when not debugging

Modified: trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
===================================================================
--- trunk/qgis/src/providers/ogr/qgsogrprovider.cpp	2010-09-24 08:01:47 UTC (rev 14280)
+++ trunk/qgis/src/providers/ogr/qgsogrprovider.cpp	2010-09-25 14:21:50 UTC (rev 14281)
@@ -58,7 +58,7 @@
 {
     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 @@
     {
       CPLPopErrorHandler();
     }
-
 };
 
 QgsOgrProvider::QgsOgrProvider( QString const & uri )

Modified: trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp	2010-09-24 08:01:47 UTC (rev 14280)
+++ trunk/qgis/src/providers/postgres/qgspostgresprovider.cpp	2010-09-25 14:21:50 UTC (rev 14281)
@@ -623,7 +623,7 @@
     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 @@
 
   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 @@
       }
       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 @@
     }
     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 @@
   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(