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

Updating of ADS RDD

Browse Source
This commit is contained in:
Alexander S.Kresin
2000-02-27 08:06:29 +00:00
parent c1046d07a9
commit 2908118e57
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -1,3 +1,11 @@
20000227-10:58 GMT+3 Alexander Kresin
* contrib/rdd_ads/ads1.c
* Bug fixed in adsRawLock() ( code proposed by Sid Sailors )
* adsOrderInfo() corrected, added support for ORDFOR(), ORDBAGNAME(), ORDNAME()
* source/rdd/dbcmd.c
* pInfo.ItmOrder initialized with NULL, where it is necessary
( Victor Szel proposal )
20000227-08:59 GMT+2 Chen Kedem <niki@actcom.co.il>
* source/rtl/binnum.c
+ doc for all function

27
harbour/contrib/rdd_ads/ads1.c
View File

@@ -989,6 +989,8 @@ static ERRCODE adsOrderInfo( ADSAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrde
if( ulRetVal != AE_SUCCESS )
return FAILURE;
}
else
phIndex = pArea->hOrdCurrent;
switch( uiIndex )
{
case DBOI_BAGEXT:
@@ -999,18 +1001,25 @@ static ERRCODE adsOrderInfo( ADSAREAP pArea, USHORT uiIndex, LPDBORDERINFO pOrde
AdsGetIndexExpr( phIndex, aucBuffer, &pusLen);
hb_itemPutC( pOrderInfo->itmResult, aucBuffer );
break;
case DBOI_CONDITION:
AdsGetIndexCondition( phIndex, aucBuffer, &pusLen);
hb_itemPutC( pOrderInfo->itmResult, aucBuffer );
break;
case DBOI_NAME:
AdsGetIndexName( phIndex, aucBuffer, &pusLen);
hb_itemPutC( pOrderInfo->itmResult, aucBuffer );
break;
case DBOI_BAGNAME:
AdsGetIndexFilename ( phIndex,ADS_BASENAME , aucBuffer, &pusLen);
hb_itemPutC( pOrderInfo->itmResult, aucBuffer );
break;
case DBOI_NUMBER :
{
UNSIGNED16 usOrder = 0;
if( IS_STRING( pOrderInfo->itmOrder ) )
if( phIndex )
AdsGetIndexOrderByHandle(phIndex, &usOrder);
else if( IS_STRING( pOrderInfo->itmOrder ) )
usOrder = hb_itemGetNI( pOrderInfo->itmOrder );
else
{
if(pArea->hOrdCurrent) /* Take the active index when no index specified*/
AdsGetIndexOrderByHandle(pArea->hOrdCurrent, &usOrder);
}
usOrder = 0;
hb_itemPutNI(pOrderInfo->itmResult, usOrder);
break;
}
@@ -1035,12 +1044,16 @@ static ERRCODE adsRawLock( ADSAREAP pArea, USHORT uiAction, ULONG lRecNo )
switch( uiAction )
{
case REC_LOCK:
if( pArea->lpExtendInfo->fExclusive || pArea->lpDataInfo->fFileLocked )
return SUCCESS;
ulRetVal = AdsLockRecord( pArea->hTable, lRecNo );
if ( ulRetVal != AE_SUCCESS )
return FAILURE;
break;
case REC_UNLOCK:
if( pArea->lpExtendInfo->fExclusive || pArea->lpDataInfo->fFileLocked )
return SUCCESS;
ulRetVal = AdsUnlockRecord( pArea->hTable, lRecNo );
if ( ulRetVal != AE_SUCCESS )
return FAILURE;