From 7edea06f203f2576cb7c8f1ad4137e7be2f60ff6 Mon Sep 17 00:00:00 2001 From: Massimo Belgrano Date: Thu, 10 Apr 2008 13:32:50 +0000 Subject: [PATCH] 2008-04-09 UTC+0100 Belgrano Massimo (mbelgrano/at/deltain.it) * harbour/contrib/rddado/adordd.prg Instead of overloading FOUND method in ADO RDD it will be more efficient to use standard implementation written in C by Przemyslaw suggestion --- harbour/ChangeLog | 6 ++++++ harbour/contrib/rddado/adordd.prg | 14 ++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 861c7a5e0c..057cc14205 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2008-04-09 UTC+0100 Belgrano Massimo (mbelgrano/at/deltain.it) + * harbour/contrib/rddado/adordd.prg + Instead of overloading FOUND method in ADO RDD it will be + more efficient to use standard implementation written in C + by Przemyslaw suggestion + 2008-04-09 20:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/ChangeLog * harbour/harbour.spec diff --git a/harbour/contrib/rddado/adordd.prg b/harbour/contrib/rddado/adordd.prg index 17c3f1244a..360d3a34b1 100644 --- a/harbour/contrib/rddado/adordd.prg +++ b/harbour/contrib/rddado/adordd.prg @@ -84,9 +84,8 @@ #define WA_SCOPEINFO 13 #define WA_SQLSTRUCT 14 -#define WA_FOUND 15 -#define WA_SIZE 15 +#define WA_SIZE 14 ANNOUNCE ADORDD @@ -592,12 +591,13 @@ static function ADO_LOCATE( nWA, lContinue ) local oRecordSet := aWAData[ WA_RECORDSET ] oRecordSet:Find( aWAData[ WA_SCOPEINFO ][ UR_SI_CFOR ], If( lContinue, 1, 0 ) ) - aWAData[ WA_FOUND ] = ! oRecordSet:EOF + USRRDD_SETFOUND( nWA, ! oRecordSet:EOF ) aWAData[ WA_EOF ] = oRecordSet:EOF return SUCCESS + static function ADO_CLEARREL( nWA ) local aWAData := USRRDD_AREADATA( nWA ) @@ -774,7 +774,7 @@ function ADORDD_GETFUNCTABLE( pFuncCount, pFuncTable, pSuperTable, nRddID ) aADOFunc[ UR_ORDLSTADD ] := ( @ADO_ORDLSTADD() ) aADOFunc[ UR_ORDLSTCLEAR ] := ( @ADO_ORDLSTCLEAR() ) aAdoFunc[ UR_FOUND ] := ( @ADO_FOUND() ) - + return USRRDD_GETFUNCTABLE( pFuncCount, pFuncTable, pSuperTable, nRddID, cSuperRDD,; aADOFunc ) @@ -996,11 +996,5 @@ function HB_AdoRddGetRecordSet( nWA ) aWAData = USRRDD_AREADATA( nWA ) return If( aWAData != nil, aWAData[ WA_RECORDSET ], nil ) -static function ADO_FOUND( nWA, lFound ) - local aWAData := USRRDD_AREADATA( nWA ) - - lFound = aWAData[ WA_FOUND ] - -return SUCCESS