fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2002-10-14 11:45 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>

Browse Source
This commit is contained in:
Alexander S.Kresin
2002-10-14 07:43:55 +00:00
parent 052615e4c8
commit 20b7b52779
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2002-10-14 11:45 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
* source/rdd/dbfntx/dbfntx1.c
! bug fixed in scopes, when the last record of current order was in the scope
! bug fixed in error handling while index creating
* source/rdd/dbfcdx/dbfcdx1.c
! bug fixed in error handling while index creating ( the same as in dbfntx )
2002-10-14 0:10 UTC-0800 Brian Hays <bhays@abacuslaw.com>
* contrib/rdd_ads/rddads.h
* contrib/rdd_ads/ads1.c

5
harbour/source/rdd/dbfcdx/dbfcdx1.c
View File

@@ -5825,7 +5825,10 @@ ERRCODE hb_cdxOrderCreate( CDXAREAP pAreaCdx, LPDBORDERCREATEINFO pOrderInfo )
break;
default:
bType = '\0';
hb_itemRelease( pKeyExp );
if( pExpMacro != NULL )
hb_macroDelete( pExpMacro );
return FAILURE;
}
hb_itemRelease( pResult );

26
harbour/source/rdd/dbfntx/dbfntx1.c
View File

@@ -131,6 +131,11 @@
HB_FUNC( _DBFNTX );
HB_FUNC( DBFNTX_GETFUNCTABLE );
#ifdef HB_PCODE_VER
#undef HB_PRG_PCODE_VER
#define HB_PRG_PCODE_VER HB_PCODE_VER
#endif
HB_INIT_SYMBOLS_BEGIN( dbfntx1__InitSymbols )
{ "_DBFNTX", HB_FS_PUBLIC, HB_FUNCNAME( _DBFNTX ), 0 },
{ "DBFNTX_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( DBFNTX_GETFUNCTABLE) , 0 }
@@ -3116,13 +3121,16 @@ static ERRCODE ntxSkipRaw( NTXAREAP pArea, LONG lToSkip )
while ( !pTag->TagEOF && lToSkip-- > 0 )
{
hb_ntxTagKeyGoTo( pTag, NEXT_RECORD, &lContinue );
if( !hb_ntxInTopScope( pTag, pTag->CurKeyInfo->key ) )
if( !pTag->TagEOF )
{
ntxSeek( pArea, 1, pTag->topScope, 0 );
}
else if( !hb_ntxInBottomScope( pTag, pTag->CurKeyInfo->key ) )
{
pTag->TagEOF = TRUE;
if( !hb_ntxInTopScope( pTag, pTag->CurKeyInfo->key ) )
{
ntxSeek( pArea, 1, pTag->topScope, 0 );
}
else if( !hb_ntxInBottomScope( pTag, pTag->CurKeyInfo->key ) )
{
pTag->TagEOF = TRUE;
}
}
}
pArea->ulRecNo = ulRecNo;
@@ -3470,6 +3478,12 @@ static ERRCODE ntxOrderCreate( NTXAREAP pArea, LPDBORDERCREATEINFO pOrderInfo )
uiLen = pResult->item.asString.length > NTX_MAX_KEY ? NTX_MAX_KEY :
pResult->item.asString.length ;
break;
default:
hb_itemRelease( pKeyExp );
if( pExpMacro != NULL )
hb_macroDelete( pExpMacro );
return FAILURE;
}
/* Make sure uiLen is not 0 */