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

2009-05-31 17:30 UTC+0200 Petr Chornyj (myorg63 at mail.ru)

Browse Source 
* 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
This commit is contained in:
Petr Chornyj
2009-05-31 14:25:53 +00:00
parent 9e136f7eaa
commit 02bfdcea52
4 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -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

33
harbour/include/std.ch
View File

@@ -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>]] => ;

6
harbour/source/rdd/dbdelim.prg
View File

@@ -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

6
harbour/source/rdd/dbsdf.prg
View File

@@ -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 ) )