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

2002-11-20 21:56 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>

Browse Source
This commit is contained in:
Alexander S.Kresin
2002-11-20 18:53:33 +00:00
parent ed35223c5e
commit 1ae48e567f
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

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

4
harbour/source/codepage/cdppl852.c
View File

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

4
harbour/source/codepage/cdppliso.c
View File

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

4
harbour/source/codepage/cdpplmaz.c
View File

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

13
harbour/source/rdd/dbcmd.c
View File

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