From 1ae48e567fdfd9aa15df202fa5ccc24aea1c4668 Mon Sep 17 00:00:00 2001
From: "Alexander S.Kresin" <alex@belacy.belgorod.su>
Date: Wed, 20 Nov 2002 18:53:33 +0000
Subject: [PATCH] 2002-11-20 21:56 UTC+0300 Alexander Kresin
 <alex@belacy.belgorod.su>

---
 harbour/ChangeLog                  |  8 ++++++++
 harbour/source/codepage/cdppl852.c |  4 ++--
 harbour/source/codepage/cdppliso.c |  4 ++--
 harbour/source/codepage/cdpplmaz.c |  4 ++--
 harbour/source/rdd/dbcmd.c         | 13 +++++--------
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b0e213cdd8..997ddcae95 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2002-11-20 21:56 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
+  * source/codepage/cdppl852.c
+  * source/codepage/cdppliso.c
+  * source/codepage/cdpplmaz.c
+    ! Minor fix in comment delimiters
+  * source/rdd/dbcmd.c
+    ! COPY TO ... FIELDS is fixed again
+
 2002-11-18 22:35 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
   * source/rdd/dbcmd.c
     ! COPY TO ... FIELDS ... is fixed - fields in the result dbf are in the 
diff --git a/harbour/source/codepage/cdppl852.c b/harbour/source/codepage/cdppl852.c
index 49e8fa6d5b..b95e2615c4 100644
--- a/harbour/source/codepage/cdppl852.c
+++ b/harbour/source/codepage/cdppl852.c
@@ -49,8 +49,8 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  *
- *      Polish              CP852          PL852
- *
+ */
+
 /* Language name: Polish */
 /* ISO language code (2 chars): PL */
 /* Codepage: 852 */
diff --git a/harbour/source/codepage/cdppliso.c b/harbour/source/codepage/cdppliso.c
index 3bea405d8f..ff40731d3a 100644
--- a/harbour/source/codepage/cdppliso.c
+++ b/harbour/source/codepage/cdppliso.c
@@ -49,8 +49,8 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  *
- *      Polish              ISO-8859-1   PLISO
- *
+ */
+
 /* Language name: Polish */
 /* ISO language code (2 chars): PL */
 /* Codepage: ISO */
diff --git a/harbour/source/codepage/cdpplmaz.c b/harbour/source/codepage/cdpplmaz.c
index 0c347b38d6..0486e1a780 100644
--- a/harbour/source/codepage/cdpplmaz.c
+++ b/harbour/source/codepage/cdpplmaz.c
@@ -49,8 +49,8 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.
  *
- * Polish     Mazovia      PLMAZ
- *
+ */
+
 /* Language name: Polish */
 /* ISO language code (2 chars): PL */
 /* Codepage: MAZ */
diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c
index b10d6cddf5..0a4e7dfd48 100644
--- a/harbour/source/rdd/dbcmd.c
+++ b/harbour/source/rdd/dbcmd.c
@@ -3679,9 +3679,9 @@ static LPAREANODE GetTheOtherArea( char *szDriver, char * szFileName, BOOL creat
 }
 
 /* move the Field Data between areas by name */
-static void rddMoveFields( AREAP pAreaFrom, AREAP pAreaTo, PHB_ITEM pFields, BOOL bNameMatch, LPAREANODE s )
+static void rddMoveFields( AREAP pAreaFrom, AREAP pAreaTo, PHB_ITEM pFields, LPAREANODE s )
 {
-  USHORT   i, f=1;
+  USHORT   i, f;
   PHB_ITEM fieldValue;
 
   fieldValue = hb_itemNew( NULL );
@@ -3690,15 +3690,14 @@ static void rddMoveFields( AREAP pAreaFrom, AREAP pAreaTo, PHB_ITEM pFields, BOO
     /* list or field in the list?*/
     if ( !pFields || IsFieldIn( (( PHB_DYNS )(pAreaFrom->lpFields + i)->sym )->pSymbol->szName,  pFields ))
     {
-      if ( bNameMatch )
-        f = hb_rddFieldIndex( pAreaTo, (( PHB_DYNS )(pAreaFrom->lpFields + i)->sym )->pSymbol->szName );
+      f = hb_rddFieldIndex( pAreaTo, (( PHB_DYNS )(pAreaFrom->lpFields + i)->sym )->pSymbol->szName );
       if ( f )
       {
         LPAREANODE s_curr = s_pCurrArea;
         SELF_GETVALUE( pAreaFrom, i+1, fieldValue );
         if( s )
            s_pCurrArea = s;
-        SELF_PUTVALUE( pAreaTo, f++, fieldValue );
+        SELF_PUTVALUE( pAreaTo, f, fieldValue );
         s_pCurrArea = s_curr;
       }
     }
@@ -3715,7 +3714,6 @@ static ERRCODE rddMoveRecords( char *cAreaFrom, char *cAreaTo, PHB_ITEM pFields,
   LONG       toGo=lNext;
   BOOL       bFor, bWhile;
   BOOL       keepGoing=TRUE;
-  BOOL       bNameMatch=FALSE;
   AREAP      pAreaFrom;
   AREAP      pAreaTo;
   LPAREANODE pAreaRelease=NULL;
@@ -3756,7 +3754,6 @@ static ERRCODE rddMoveRecords( char *cAreaFrom, char *cAreaTo, PHB_ITEM pFields,
 
   if ( cAreaFrom )     /*it's an APPEND FROM*/
   {                    /*make it current*/
-    bNameMatch = TRUE; /*we pass fields by name */
     pAreaRelease = s_pCurrArea = GetTheOtherArea( szDriver, cAreaFrom, FALSE, NULL );
     pAreaFrom =  (AREAP) pAreaRelease->pArea;
   }
@@ -3803,7 +3800,7 @@ static ERRCODE rddMoveRecords( char *cAreaFrom, char *cAreaTo, PHB_ITEM pFields,
             SELF_APPEND( ( AREAP ) pAreaTo, FALSE );      /*put a new one on TO Area*/
             if ( cAreaFrom )
                s_pCurrArea = pAreaRelease;
-            rddMoveFields( pAreaFrom, pAreaTo, pFields, bNameMatch,(cAreaFrom)?s_pCurrAreaSaved:NULL ); /*move the data*/
+            rddMoveFields( pAreaFrom, pAreaTo, pFields, (cAreaFrom)?s_pCurrAreaSaved:NULL ); /*move the data*/
          }
          if ( lRec == 0 || pFor )  /*not only one record? Or there's a For clause?*/
             keepGoing = TRUE;