Changeset 13645

Timestamp:

01/31/08 17:32:46 (5 months ago)

Author:

warmerdam

Message:

improve error reporting, add ExecuteSQL/OGRIngresResultLayer

Files:

• trunk/gdal/ogr/ogrsf_frmts/ingres/GNUmakefile (modified) (1 diff)
• trunk/gdal/ogr/ogrsf_frmts/ingres/ogr_ingres.h (modified) (5 diffs)
• trunk/gdal/ogr/ogrsf_frmts/ingres/ogringresdatasource.cpp (modified) (6 diffs)
• trunk/gdal/ogr/ogrsf_frmts/ingres/ogringreslayer.cpp (modified) (2 diffs)
• trunk/gdal/ogr/ogrsf_frmts/ingres/ogringresresultlayer.cpp (added)
• trunk/gdal/ogr/ogrsf_frmts/ingres/ogringresstatement.cpp (modified) (2 diffs)
• trunk/gdal/ogr/ogrsf_frmts/ingres/ogringrestablelayer.cpp (modified) (1 diff)

trunk/gdal/ogr/ogrsf_frmts/ingres/GNUmakefile

@@ -7 +7 @@
-
-OBJ     =       ogringresdriver.o ogringresstatement.o ogringresdatasource.o \
-
+ ogringresresultlayer.o
-
-#       ogringresresultlayer.o

trunk/gdal/ogr/ogrsf_frmts/ingres/ogr_ingres.h

@@ -61 +61 @@
-    char **GetRow();
-    void   DumpRow( FILE * );
+    static void         ReportError( IIAPI_GENPARM *, const char * = NULL );
-};
-
@@ -172 +173 @@
-};
-
-#ifdef notdef
-/************************************************************************/
-/*                         OGRIngresResultLayer                          */
@@ -190 +190 @@
-  public:
-                        OGRIngresResultLayer( OGRIngresDataSource *,
-
-INGRES_RES *hResultSetIn
+ 
+ OGRIngresStatement *hStmt
-    virtual             ~OGRIngresResultLayer();
-
@@ -200 +200 @@
-    virtual int         GetFeatureCount( int );
-};
-#endif
-
-class OGRIngresLayer;
-
-/************************************************************************/
@@ -262 +259 @@
-    // nonstandard
-
-    void                ReportError( const char * = NULL );
-    
-    char               *LaunderName( const char * );
-};

trunk/gdal/ogr/ogrsf_frmts/ingres/ogringresdatasource.cpp

@@ -83 +83 @@
-
-/************************************************************************/
-/*                            ReportError()                             */
-/************************************************************************/
-
-void OGRIngresDataSource::ReportError( const char *pszDescription )
-
-{
-#ifdef notdef
-    if( pszDescription )
-        CPLError( CE_Failure, CPLE_AppDefined, 
-                  "Ingres error message:%s Description: %s", 
-                  ingres_error( hConn ), 
-                  pszDescription );
-    else
-        CPLError( CE_Failure, CPLE_AppDefined, 
-                  "%s", ingres_error( hConn ) );
-#endif
-}
-
-/************************************************************************/
-/*                                Open()                                */
-/************************************************************************/
@@ -152 +133 @@
-
-    IIapi_connect( &connParm );
-
+   
-    while( connParm.co_genParm.gp_completed == FALSE )
-        IIapi_wait( &waitParm );
@@ -158 +139 @@
-    hConn = connParm.co_connHandle;
-
-hConn == NULL )
-{
-    CPLError( CE_Failure, CPLE_OpenFailed,
-          "Attempt to connect to Ingres database '%s' failed.",
-pszDBName
+connParm.co_genParm.gp_status != IIAPI_ST_SUCCESS 
+    || hConn == NULL )
+{
+OGRIngresStatement::ReportError( &(connParm.co_genParm), 
+                  "Failed to connect to Ingres database."
-        return FALSE;
-    }
@@ -543 +524 @@
-
-{
-#ifdef notdef
-    if( poSpatialFilter != NULL )
-    {
-        CPLDebug( "OGR_INGRES", 
-          "Spatial filter ignored for now in OGRIngresDataSource::ExecuteSQL()" );
-    }
-
-/* -------------------------------------------------------------------- */
-/*      Use generic implementation for OGRSQL dialect.                  */
@@ -558 +532 @@
-                                          pszDialect );
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return NULL;
-    }
-#endif
-
-/* -------------------------------------------------------------------- */
-/*      Make sure there isn't an active transaction already.            */
-/* -------------------------------------------------------------------- */
-    InterruptLongResult();
-
-/* -------------------------------------------------------------------- */
-/*      Execute the statement.                                          */
-/* -------------------------------------------------------------------- */
-    INGRES_RES *hResultSet;
-
-    if( ingres_query( hConn, pszSQLCommand ) )
-    {
-        ReportError( pszSQLCommand );
-        return NULL;
-    }
-
-    hResultSet = ingres_use_result( hConn );
-    if( hResultSet == NULL )
-    {
-        if( ingres_field_count( hConn ) == 0 )
-        {
-            CPLDebug( "INGRES", "Command '%s' succeeded, %d rows affected.", 
-                      pszSQLCommand, 
-                      (int) ingres_affected_rows(hConn) );
-            return NULL;
-        }
-        else
-        {
-            ReportError( pszSQLCommand );
-            return NULL;
-        }
-    }
-
@@ -614 +556 @@
-    OGRIngresResultLayer *poLayer = NULL;
-
-hResultSe
+poStatemen
-        
-    return poLayer;
-#endif
-    return NULL;
-}
-

trunk/gdal/ogr/ogrsf_frmts/ingres/ogringreslayer.cpp

@@ -113 +113 @@
-
-{
-
-    for( ; TRUE; )
-    {
@@ -311 +310 @@
-
-        if( !poResultSet->ExecuteSQL( pszQueryStatement ) )
-        {
-            poDS->ReportError( pszQueryStatement );
-            return NULL;
-        }
-    }
-

trunk/gdal/ogr/ogrsf_frmts/ingres/ogringresstatement.cpp

@@ -129 +129 @@
-        IIapi_wait( &waitParm );
-
+    if( queryParm.qy_genParm.gp_status != IIAPI_ST_SUCCESS 
+        || hConn == NULL )
+    {
+        ReportError( &(queryParm.qy_genParm), 
+                     CPLString().Printf( "IIapi_query(%s)", pszStatement ) );
+        return FALSE;
+    }
+
-    if( queryParm.qy_stmtHandle == NULL )
-        return FALSE;
@@ -236 +244 @@
-}
-
+/************************************************************************/
+/*                            ReportError()                             */
+/************************************************************************/
+
+void OGRIngresStatement::ReportError( IIAPI_GENPARM *genParm,
+                                      const char *pszDescription )
+
+{
+    IIAPI_GETEINFOPARM  getErrParm; 
+
+    /*
+    ** Check API call status.
+    */
+    const char *pszCode = 
+        (genParm->gp_status == IIAPI_ST_SUCCESS) ?  
+        "IIAPI_ST_SUCCESS" :
+        (genParm->gp_status == IIAPI_ST_MESSAGE) ?  
+        "IIAPI_ST_MESSAGE" :
+        (genParm->gp_status == IIAPI_ST_WARNING) ?  
+        "IIAPI_ST_WARNING" :
+        (genParm->gp_status == IIAPI_ST_NO_DATA) ?  
+        "IIAPI_ST_NO_DATA" :
+        (genParm->gp_status == IIAPI_ST_ERROR)   ?  
+        "IIAPI_ST_ERROR"   :
+        (genParm->gp_status == IIAPI_ST_FAILURE) ? 
+        "IIAPI_ST_FAILURE" :
+        (genParm->gp_status == IIAPI_ST_NOT_INITIALIZED) ?
+        "IIAPI_ST_NOT_INITIALIZED" :
+        (genParm->gp_status == IIAPI_ST_INVALID_HANDLE) ?
+        "IIAPI_ST_INVALID_HANDLE"  :
+        (genParm->gp_status == IIAPI_ST_OUT_OF_MEMORY) ?
+        "IIAPI_ST_OUT_OF_MEMORY"   :
+        "(unknown status)";
+
+    /*
+    ** Check for error information.
+    */
+    if ( ! genParm->gp_errorHandle ) return;
+    getErrParm.ge_errorHandle = genParm->gp_errorHandle;
+    
+    CPLString osErrorMessage;
+    CPLErr eType = CE_Failure;
+        
+    osErrorMessage.Printf( "%s: %s", pszDescription, pszCode );
+
+    do
+    { 
+        /*
+        ** Invoke API function call.
+        */
+        IIapi_getErrorInfo( &getErrParm );
+
+        /*
+        ** Break out of the loop if no data or failed.
+        */
+        if ( getErrParm.ge_status != IIAPI_ST_SUCCESS )
+            break;
+
+        /*
+        ** Process result.
+        */
+
+        switch( getErrParm.ge_type )
+        {
+           case IIAPI_GE_ERROR          : 
+            eType = CE_Failure; 
+            break;
+
+          case IIAPI_GE_WARNING :
+            eType = CE_Warning;
+            break;
+
+          case IIAPI_GE_MESSAGE :
+            eType = CE_Debug;
+            break;
+
+          default:
+            eType = CE_Failure;
+            break;
+        }
+
+        CPLString osMoreMsg;
+
+        osMoreMsg.Printf( "\n'%s' 0x%x\n%s",
+                  getErrParm.ge_SQLSTATE, getErrParm.ge_errorCode,
+                  getErrParm.ge_message ? getErrParm.ge_message : "NULL" );
+        osErrorMessage += osMoreMsg;
+    } while( 1 );
+
+    CPLError( eType, CPLE_AppDefined, "%s", osErrorMessage.c_str() );
+}
+

trunk/gdal/ogr/ogrsf_frmts/ingres/ogringrestablelayer.cpp

@@ -114 +114 @@
-    if( !oStatement.ExecuteSQL( osCommand ) )
-    {
-        poDS->ReportError( "DESCRIBE Failed" );
-        return NULL;
-    }