From 64b5a2586fffa254df3829f67105c9ccf61378e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Wed, 11 Feb 2015 09:26:33 +0100
Subject: [PATCH] 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.

---
 ChangeLog.txt  |  8 ++++++++
 src/rdd/dbf1.c | 29 ++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 684b660b4e..ea55cf4019 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -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
diff --git a/src/rdd/dbf1.c b/src/rdd/dbf1.c
index 71cad6aaa3..532984efee 100644
--- a/src/rdd/dbf1.c
+++ b/src/rdd/dbf1.c
@@ -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;