From 94f7732093c525039511dd2c5e90be8fbb87540d Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Fri, 10 Aug 2001 17:29:36 +0000 Subject: [PATCH] See ChangeLog entry 2001-08-10 13:30 UTC-0400 David G. Holm --- harbour/ChangeLog | 8 ++++++++ harbour/source/rtl/dbdelim.prg | 11 +++++++++++ harbour/source/rtl/dbsdf.prg | 11 +++++++++++ 3 files changed, 30 insertions(+) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index aaa80da9d1..b37110b73d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +2001-08-10 13:30 UTC-0400 David G. Holm + + * source/rtl/dbdelim.prg + * source/rtl/dbsdf.prg + + Added a run time error (9999, Operation not supported) when + trying to use APPEND FROM DELIMITED or APPEND FROM SDF, with + default allowed. + 2001-08-10 12:15 UTC-0400 David G. Holm * source/vm/extend.c diff --git a/harbour/source/rtl/dbdelim.prg b/harbour/source/rtl/dbdelim.prg index a12358d7ff..135d38d138 100644 --- a/harbour/source/rtl/dbdelim.prg +++ b/harbour/source/rtl/dbdelim.prg @@ -238,6 +238,16 @@ FUNCTION __dbDelim( lExport, cFile, cDelimArg, aFields, bFor, bWhile, nNext, nRe END IF ELSE // APPEND FROM DELIMITED + oErr := ErrorNew() + oErr:severity := ES_ERROR + oErr:genCode := EG_UNSUPPORTED + oErr:subSystem := "DELIM" + oErr:subCode := 9999 + oErr:description := HB_LANGERRMSG( oErr:genCode ) + oErr:canRetry := .F. + oErr:canDefault := .T. + Eval(ErrorBlock(), oErr) + /* handle := FOPEN( cFileName ) IF handle == -1 oErr := ErrorNew() @@ -258,6 +268,7 @@ FUNCTION __dbDelim( lExport, cFile, cDelimArg, aFields, bFor, bWhile, nNext, nRe END IF FCLOSE( handle ) END IF + */ END IF RETURN NIL diff --git a/harbour/source/rtl/dbsdf.prg b/harbour/source/rtl/dbsdf.prg index d3fa72dd2d..5875e9e52a 100644 --- a/harbour/source/rtl/dbsdf.prg +++ b/harbour/source/rtl/dbsdf.prg @@ -214,6 +214,16 @@ FUNCTION __dbSDF( lExport, cFile, aFields, bFor, bWhile, nNext, nRecord, lRest ) END IF ELSE // APPEND FROM SDF + oErr := ErrorNew() + oErr:severity := ES_ERROR + oErr:genCode := EG_UNSUPPORTED + oErr:subSystem := "SDF" + oErr:subCode := 9999 + oErr:description := HB_LANGERRMSG( oErr:genCode ) + oErr:canRetry := .F. + oErr:canDefault := .T. + Eval(ErrorBlock(), oErr) + /* handle := FOPEN( cFileName ) IF handle == -1 oErr := ErrorNew() @@ -234,6 +244,7 @@ FUNCTION __dbSDF( lExport, cFile, aFields, bFor, bWhile, nNext, nRecord, lRest ) END IF FCLOSE( handle ) END IF + */ END IF RETURN NIL