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

2015-02-11 09:26 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/rdd/dbf1.c
    + finished support for AutoInc flag (+) for all numeric fields (N, F, I, B)
      in DBF* RDDs. Now user can define field like:
            { "COUNTER", "I:+", 4, 0 }
      and they will work like autoincrement fields but without any assign
      restrictions.
This commit is contained in:
Przemysław Czerpak
2015-02-11 09:26:33 +01:00
parent 7886f9f0ea
commit 64b5a2586f
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog.txt
View File

@@ -10,6 +10,14 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2015-02-11 09:26 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rdd/dbf1.c
+ finished support for AutoInc flag (+) for all numeric fields (N, F, I, B)
in DBF* RDDs. Now user can define field like:
{ "COUNTER", "I:+", 4, 0 }
and they will work like autoincrement fields but without any assign
restrictions.
2015-02-10 17:23 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* include/hbznet.h
* src/rtl/hbinet.c

29
src/rdd/dbf1.c
View File

@@ -382,11 +382,12 @@ static void hb_dbfSetBlankRecord( DBFAREAP pArea, int iType )
else if( bNext == HB_BLANK_AUTOINC )
{
HB_MAXINT nValue = hb_dbfGetNextValue( pArea, uiCount, HB_TRUE );
if( pField->uiDec )
nValue = ( HB_MAXINT ) hb_numDecConv( ( double ) nValue, -( int ) pField->uiDec );
if( pField->uiType == HB_FT_INTEGER ||
pField->uiType == HB_FT_AUTOINC )
{
if( pField->uiDec )
nValue = ( HB_MAXINT ) hb_numDecConv( ( double ) nValue,
-( int ) pField->uiDec );
if( uiLen == 1 )
*pPtr = ( signed char ) nValue;
else if( uiLen == 2 )
@@ -410,7 +411,9 @@ static void hb_dbfSetBlankRecord( DBFAREAP pArea, int iType )
pPtr[ --ui ] = ( HB_BYTE ) nValue % 10 + '0';
nValue /= 10;
}
while( ui && nValue >= 1 );
while( ui && nValue > 0 );
while( ui )
pPtr[ --ui ] = ' ';
}
pPtr += uiLen;
}
@@ -3220,6 +3223,11 @@ static HB_ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo )
pThisField->bType = 'N';
pThisField->bLen = ( HB_BYTE ) pField->uiLen;
pThisField->bDec = ( HB_BYTE ) pField->uiDec;
if( ( pField->uiFlags & HB_FF_AUTOINC ) != 0 )
{
HB_PUT_LE_UINT32( pThisField->bCounter, 1 );
pThisField->bStep = 1;
}
pArea->uiRecordLen += pField->uiLen;
break;
@@ -3227,6 +3235,11 @@ static HB_ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo )
pThisField->bType = 'F';
pThisField->bLen = ( HB_BYTE ) pField->uiLen;
pThisField->bDec = ( HB_BYTE ) pField->uiDec;
if( ( pField->uiFlags & HB_FF_AUTOINC ) != 0 )
{
HB_PUT_LE_UINT32( pThisField->bCounter, 1 );
pThisField->bStep = 1;
}
pArea->uiRecordLen += pField->uiLen;
break;
@@ -3236,6 +3249,11 @@ static HB_ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo )
pField->uiLen = 8;
pThisField->bLen = ( HB_BYTE ) pField->uiLen;
pThisField->bDec = ( HB_BYTE ) pField->uiDec;
if( ( pField->uiFlags & HB_FF_AUTOINC ) != 0 )
{
HB_PUT_LE_UINT32( pThisField->bCounter, 1 );
pThisField->bStep = 1;
}
pArea->uiRecordLen += pField->uiLen;
break;
@@ -3251,6 +3269,11 @@ static HB_ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo )
}
pThisField->bLen = ( HB_BYTE ) pField->uiLen;
pThisField->bDec = ( HB_BYTE ) pField->uiDec;
if( ( pField->uiFlags & HB_FF_AUTOINC ) != 0 )
{
HB_PUT_LE_UINT32( pThisField->bCounter, 1 );
pThisField->bStep = 1;
}
pArea->uiRecordLen += pField->uiLen;
break;