From 02bfdcea52438701a8684dd4c8341494f77b99ca Mon Sep 17 00:00:00 2001
From: Petr Chornyj <myorg63@mail.ru>
Date: Sun, 31 May 2009 14:25:53 +0000
Subject: [PATCH] 2009-05-31 17:30 UTC+0200 Petr Chornyj (myorg63 at mail.ru)  
  * harbour/include/std.ch     + added clause CODEPAGE for commands COPY,
 APPEND, SORT, TOTAL    * harbour/source/rdd/dbdelim.prg    *
 harbour/source/rdd/dbsdf.prg     + added CODEPAGE support for __dbDelim,
 __dbSdf

---
 harbour/ChangeLog              |  7 +++++++
 harbour/include/std.ch         | 33 +++++++++++++++++----------------
 harbour/source/rdd/dbdelim.prg |  6 +++---
 harbour/source/rdd/dbsdf.prg   |  6 +++---
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 13c6f288c1..385558af31 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-31 17:30 UTC+0200 Petr Chornyj (myorg63 at mail.ru)
+   * harbour/include/std.ch
+    + added clause CODEPAGE for commands COPY, APPEND, SORT, TOTAL
+   * harbour/source/rdd/dbdelim.prg
+   * harbour/source/rdd/dbsdf.prg
+    + added CODEPAGE support for __dbDelim, __dbSdf
+
 2009-05-30 08:10 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     ! Fix to path normalizer. Last fix wasn't without side-effects
diff --git a/harbour/include/std.ch b/harbour/include/std.ch
index 8351000d0c..239ede407b 100644
--- a/harbour/include/std.ch
+++ b/harbour/include/std.ch
@@ -394,52 +394,53 @@
 #command COPY [TO <(f)>] [FIELDS <fields,...>] ;
               [FOR <for>] [WHILE <while>] [NEXT <next>] ;
               [RECORD <rec>] [<rest:REST>] [ALL] ;
-              [DELIMITED [WITH <*delim*>]] => ;
+              [DELIMITED [WITH <*delim*>]] [CODEPAGE <cp>] => ;
          __dbDelim( .T., <(f)>, <(delim)>, { <(fields)> }, ;
-                    <{for}>, <{while}>, <next>, <rec>, <.rest.> )
+                    <{for}>, <{while}>, <next>, <rec>, <.rest.>, <cp> )
 
 #command COPY [TO <(f)>] [SDF] [FIELDS <fields,...>] ;
               [FOR <for>] [WHILE <while>] [NEXT <next>] ;
-              [RECORD <rec>] [<rest:REST>] [ALL] => ;
+              [RECORD <rec>] [<rest:REST>] [ALL] [CODEPAGE <cp>] => ;
          __dbSDF( .T., <(f)>, { <(fields)> }, ;
-                  <{for}>, <{while}>, <next>, <rec>, <.rest.> )
+                  <{for}>, <{while}>, <next>, <rec>, <.rest.>, <cp> )
 
 #command COPY [TO <(f)>] [FIELDS <fields,...>] ;
               [FOR <for>] [WHILE <while>] [NEXT <next>] ;
-              [RECORD <rec>] [<rest:REST>] [ALL] [VIA <rdd>] => ;
+              [RECORD <rec>] [<rest:REST>] [ALL] [VIA <rdd>] [CODEPAGE <cp>] => ;
          __dbCopy( <(f)>, { <(fields)> }, ;
-                   <{for}>, <{while}>, <next>, <rec>, <.rest.>, <rdd> )
+                   <{for}>, <{while}>, <next>, <rec>, <.rest.>, <rdd>, , <cp> )
 
 #command APPEND [FROM <(f)>] [FIELDS <fields,...>] ;
                 [FOR <for>] [WHILE <while>] [NEXT <next>] ;
                 [RECORD <rec>] [<rest:REST>] [ALL] ;
-                [DELIMITED [WITH <*delim*>]] => ;
+                [DELIMITED [WITH <*delim*>]] [CODEPAGE <cp>] => ;
          __dbDelim( .F., <(f)>, <(delim)>, { <(fields)> }, ;
-                    <{for}>, <{while}>, <next>, <rec>, <.rest.> )
+                    <{for}>, <{while}>, <next>, <rec>, <.rest.>, <cp> )
 
 #command APPEND [FROM <(f)>] [SDF] [FIELDS <fields,...>] ;
                 [FOR <for>] [WHILE <while>] [NEXT <next>] ;
-                [RECORD <rec>] [<rest:REST>] [ALL] => ;
+                [RECORD <rec>] [<rest:REST>] [ALL] [CODEPAGE <cp>] => ;
          __dbSDF( .F., <(f)>, { <(fields)> }, ;
-                  <{for}>, <{while}>, <next>, <rec>, <.rest.> )
+                  <{for}>, <{while}>, <next>, <rec>, <.rest.>, <cp> )
 
 #command APPEND [FROM <(f)>] [FIELDS <fields,...>] ;
                 [FOR <for>] [WHILE <while>] [NEXT <next>] ;
-                [RECORD <rec>] [<rest:REST>] [ALL] [VIA <rdd>] => ;
+                [RECORD <rec>] [<rest:REST>] [ALL] [VIA <rdd>] 
+                [CODEPAGE <cp>] => ;
          __dbApp( <(f)>, { <(fields)> }, ;
-                  <{for}>, <{while}>, <next>, <rec>, <.rest.>, <rdd> )
+                  <{for}>, <{while}>, <next>, <rec>, <.rest.>, <rdd>, , <cp> )
 
 #command SORT [TO <(f)>] [ON <fields,...>] ;
               [FOR <for>] [WHILE <while>] [NEXT <next>] ;
-              [RECORD <rec>] [<rest:REST>] [ALL] => ;
+              [RECORD <rec>] [<rest:REST>] [ALL] [CODEPAGE <cp>] => ;
          __dbSort( <(f)>, { <(fields)> }, ;
-                   <{for}>, <{while}>, <next>, <rec>, <.rest.> )
+                   <{for}>, <{while}>, <next>, <rec>, <.rest.>, , , <cp> )
 
 #command TOTAL [TO <(f)>] [ON <key>] [FIELDS <fields,...>] ;
                [FOR <for>] [WHILE <while>] [NEXT <next>] ;
-               [RECORD <rec>] [<rest:REST>] [ALL] => ;
+               [RECORD <rec>] [<rest:REST>] [ALL] [CODEPAGE <cp>] => ;
          __dbTotal( <(f)>, <{key}>, { <(fields)> }, ;
-                    <{for}>, <{while}>, <next>, <rec>, <.rest.> )
+                    <{for}>, <{while}>, <next>, <rec>, <.rest.>, , , <cp> )
 
 #command UPDATE [FROM <(alias)>] [ON <key>] [<rand:RANDOM>] ;
                 [REPLACE <f1> WITH <x1> [, <fN> WITH <xN>]] => ;
diff --git a/harbour/source/rdd/dbdelim.prg b/harbour/source/rdd/dbdelim.prg
index 4de84752d0..af7811acd8 100644
--- a/harbour/source/rdd/dbdelim.prg
+++ b/harbour/source/rdd/dbdelim.prg
@@ -58,7 +58,7 @@
 
 REQUEST DELIM
 
-FUNCTION __dbDelim( lExport, cFile, cDelimArg, aFields, bFor, bWhile, nNext, nRecord, lRest )
+FUNCTION __dbDelim( lExport, cFile, cDelimArg, aFields, bFor, bWhile, nNext, nRecord, lRest, cCodePage )
 
 #ifdef HB_C52_STRICT
 
@@ -112,7 +112,7 @@ FUNCTION __dbDelim( lExport, cFile, cDelimArg, aFields, bFor, bWhile, nNext, nRe
 #else
 
    RETURN iif( lExport,;
-      __dbCopy( cFile, aFields, bFor, bWhile, nNext, nRecord, lRest, "DELIM", , , cDelimArg ) ,;
-      __dbApp( cFile, aFields, bFor, bWhile, nNext, nRecord, lRest, "DELIM", , , cDelimArg ) )
+      __dbCopy( cFile, aFields, bFor, bWhile, nNext, nRecord, lRest, "DELIM", , cCodePage, cDelimArg ) ,;
+      __dbApp( cFile, aFields, bFor, bWhile, nNext, nRecord, lRest, "DELIM", , cCodePage, cDelimArg ) )
 
 #endif
diff --git a/harbour/source/rdd/dbsdf.prg b/harbour/source/rdd/dbsdf.prg
index eb4c2f5dd4..5d8ce4e024 100644
--- a/harbour/source/rdd/dbsdf.prg
+++ b/harbour/source/rdd/dbsdf.prg
@@ -57,7 +57,7 @@
 
 REQUEST SDF
 
-FUNCTION __dbSDF( lExport, cFile, aFields, bFor, bWhile, nNext, nRecord, lRest )
+FUNCTION __dbSDF( lExport, cFile, aFields, bFor, bWhile, nNext, nRecord, lRest, cCodePage )
    RETURN iif( lExport,;
-      __dbCopy( cFile, aFields, bFor, bWhile, nNext, nRecord, lRest, "SDF" ) ,;
-      __dbApp( cFile, aFields, bFor, bWhile, nNext, nRecord, lRest, "SDF" ) )
+      __dbCopy( cFile, aFields, bFor, bWhile, nNext, nRecord, lRest, "SDF", , cCodePage ) ,;
+      __dbApp( cFile, aFields, bFor, bWhile, nNext, nRecord, lRest, "SDF", , cCodePage ) )