From 195196aaf95d6d21230329246e779fe1574b2083 Mon Sep 17 00:00:00 2001 From: Lutz Date: Wed, 6 Sep 2023 14:43:35 +0200 Subject: [PATCH] Fixed problem recreating DBF --- FOXBIN2PRG.DBF.CFG.TXT | 2 +- README.md | 2 +- TESTS/DATOS_READONLY/fb2p_dbc.dbc | Bin 9463 -> 9463 bytes TESTS/DATOS_READONLY/fb2p_dbc.dct | Bin 56767 -> 57349 bytes docs/ChangeLog.md | 3 ++- foxbin2prg.cfg.txt | 2 +- foxbin2prg.prg | 5 +++-- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/FOXBIN2PRG.DBF.CFG.TXT b/FOXBIN2PRG.DBF.CFG.TXT index d7136e5..b86b3bd 100644 --- a/FOXBIN2PRG.DBF.CFG.TXT +++ b/FOXBIN2PRG.DBF.CFG.TXT @@ -1,6 +1,6 @@ *################################################################################################################ *-- Individual DBF configuration file (syntax: filename.dbf.cfg) Defaults see FoxBin2prg.cfg -*Version: v1.20.05 +*Version: v1.20.06 ***************************************************************************************************************** *DBF_Conversion_Support: <0,1,2,4,8> && 0=No support, 1=Generate Header TXT only (Diff), 2=Generate Header TXT and BIN (Merge/Only Structure!), 4=Generate TXT with DATA (Diff), 8=Export and Import DATA (Merge/Structure & Data) diff --git a/README.md b/README.md index 3a27117..0b6ab91 100644 --- a/README.md +++ b/README.md @@ -153,4 +153,4 @@ See [issue #93](https://github.com/fdbozzo/foxbin2prg/issues/93). ## Usage For usage see [documentation](./docs/FoxBin2Prg.md) -Last changed: _2023/09/03_ +Last changed: _2023/09/06_ diff --git a/TESTS/DATOS_READONLY/fb2p_dbc.dbc b/TESTS/DATOS_READONLY/fb2p_dbc.dbc index ea72182d3c2e6f33747da9c535ff5ba0b77be0f3..d24f34b4fbb744218e76a7e26213cb8795560531 100644 GIT binary patch delta 21 dcmezF`Q4MnK%A3pBg=LsrX}|`?`5)50svQW2b=%^ delta 21 dcmezF`Q4MnK%A3#Bg=LsrntMC_cB>20RUB02T=e3 diff --git a/TESTS/DATOS_READONLY/fb2p_dbc.dct b/TESTS/DATOS_READONLY/fb2p_dbc.dct index bd107ec42d956dd01ae22a28269333cb974a11fe..90e342ae90c97798cdd8cdea430f8900b1542323 100644 GIT binary patch delta 36 scmdnLo4NG>GY13116BqG2F8topBN`9aBgO1+H-rdK)Kgu{o+520Md#KC;$Ke delta 27 jcmZoYz`TDqGY131-Te#<42&BEKQT^J;M~m2wC6Sef7l5r diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md index 6b2c11a..829e7e2 100644 --- a/docs/ChangeLog.md +++ b/docs/ChangeLog.md @@ -24,6 +24,7 @@ _**Note:** you can click on the version number for downloading this version from | Rel.Date | Developer | Version | Details | | - | - | - | - | +| 2023/09/03 | LScheffler | [v1.20.05](https://github.com/lscheffler/foxbin2prg/releases/tag/v1.20.05) | **Bug Fix**: Problems recreating tables (LScheffler) | | 2023/09/03 | LScheffler | [v1.20.05](https://github.com/lscheffler/foxbin2prg/releases/tag/v1.20.05) | **Bug Fix**: Problems recreating menu files (introduced with codepage) (LScheffler) | | | | | Enhancement: Inserted options to allow splitting of SCX handling from VCX.1 | | 2023/09/01 | LScheffler | [v1.20.04](https://github.com/lscheffler/foxbin2prg/releases/tag/v1.20.04) | Enhancement: New option "tcDebug" for get_DirSettings method. | @@ -435,4 +436,4 @@ _**Note:** you can click on the version number for downloading this version from | 2013/11/22 | FDBOZZO | [v1.0](https://github.com/fdbozzo/foxbin2prg/tree/v1.0---pública) | Initial creation of clases on prg and support of VCX/SCX/PJX files | ---- -Last changed: _2023/09/02_ \ No newline at end of file +Last changed: _2023/09/06_ \ No newline at end of file diff --git a/foxbin2prg.cfg.txt b/foxbin2prg.cfg.txt index 766ee41..41b356b 100644 --- a/foxbin2prg.cfg.txt +++ b/foxbin2prg.cfg.txt @@ -1,6 +1,6 @@ *################################################################################################################ *FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS) -*Version: v1.20.05 +*Version: v1.20.06 ***************************************************************************************************************** * Note, configuration files will follow an inheritance. diff --git a/foxbin2prg.prg b/foxbin2prg.prg index 9c427b6..fd2af12 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -1,5 +1,5 @@ #DEFINE DN_FB2PRG_VERSION 1.20 -#DEFINE DC_FB2PRG_VERSION_REAL '1.20.05' +#DEFINE DC_FB2PRG_VERSION_REAL '1.20.06' *--------------------------------------------------------------------------------------------------- * Module.........: FOXBIN2PRG.PRG - FOR VISUAL FOXPRO 9.0 @@ -319,6 +319,7 @@ * 01/09/2023 LScheffler v1.20.04 Enhancement: For debug option set via parameter only first valid call is used * 03/09/2023 LScheffler v1.20.05 Bug Fix: Problems recreating menu files (introduced with codepage) (LScheffler) * 03/09/2023 LScheffler v1.20.05 Enhancement: Inserted options to allow splitting of SCX handling from VCX +* 06/09/2023 LScheffler v1.20.06 Bug Fix: Problems recreating tables (LScheffler) * * *--------------------------------------------------------------------------------------------------- @@ -14555,7 +14556,7 @@ Define Class c_conversor_prg_a_dbf As c_conversor_prg_a_bin lcFieldDef = lcFieldDef + lcLongDec *-- .Null. - lcFieldDef = lcFieldDef + Iif( loField._Null = '.T.', ' .Null.', ' NOT .Null.' ) + lcFieldDef = lcFieldDef + Iif( loField._Null = '.T.', ' Null', ' NOT Null' ) *-- NoCPTran If loField._NoCPTran = '.T.'