romfast/foxbin2prg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.21.04: Added support for BodyDevInfo = 2 in CFG file to prevent both DevInfo and ObjRev from being written to PJ2 file

Browse Source
This commit is contained in:
Doug Hennig
2024-08-26 14:10:52 -05:00
parent bcec0c754b
commit ab1f03e5b8
6 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Create_FoxBin2Prg.cfg
View File

@@ -140,7 +140,7 @@ PRG_Compat_Level: 0 && 0=Legacy, 1=Use HELPSTRING as Class Procedure
*---------------------------------------------------------------------------------------------------------------- *----------------------------------------------------------------------------------------------------------------
*-- PJX special *-- PJX special
BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo, 2 = Don't keep DevInfo or ObjRev
*---------------------------------------------------------------------------------------------------------------- *----------------------------------------------------------------------------------------------------------------
*-- DBF special *-- DBF special

2
FOXBIN2PRG.DBF.CFG.TXT
View File

@@ -1,6 +1,6 @@
*################################################################################################################ *################################################################################################################
*-- Individual DBF configuration file (syntax: filename.dbf.cfg) Defaults see FoxBin2prg.cfg *-- Individual DBF configuration file (syntax: filename.dbf.cfg) Defaults see FoxBin2prg.cfg
*Version: v1.21.03 *Version: v1.21.04
***************************************************************************************************************** *****************************************************************************************************************
*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) *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)

BIN
ThorUpdater/FoxBin2Prg.zip
View File

Binary file not shown.

6
ThorUpdater/FoxBin2PrgVersion.txt
View File

@@ -3,8 +3,8 @@ lparameters toUpdateObject
* Set the properties of the passed updater object. * Set the properties of the passed updater object.
with toUpdateObject with toUpdateObject
.VersionNumber = '1.21.03 - 20240424' .VersionNumber = '1.21.04 - 20240826'
.AvailableVersion = 'FoxBin2PRG-1.21.03-update-20240424' .AvailableVersion = 'FoxBin2PRG-1.21.04-update-20240826'
.Notes = GetNotes() .Notes = GetNotes()
.RegisterWithThor = GetRegisterWithThor() .RegisterWithThor = GetRegisterWithThor()
endwith endwith
@@ -63,4 +63,4 @@ text to lcCommand noshow
endtext endtext
return lcCommand return lcCommand
*created by VFPX Deployment, 24.04.2024 16:40:08 *created by VFPX Deployment, 08/26/2024 2:08:42 PM

4
foxbin2prg.cfg.txt
View File

@@ -1,6 +1,6 @@
*################################################################################################################ *################################################################################################################
*FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS) *FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS)
*Version: v1.21.03 *Version: v1.21.04
***************************************************************************************************************** *****************************************************************************************************************
* Note, configuration files will follow an inheritance. * Note, configuration files will follow an inheritance.
@@ -137,7 +137,7 @@
*---------------------------------------------------------------------------------------------------------------- *----------------------------------------------------------------------------------------------------------------
*-- PJX special *-- PJX special
*BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo *BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo, 2 = Don't keep DevInfo or ObjRev
*---------------------------------------------------------------------------------------------------------------- *----------------------------------------------------------------------------------------------------------------
*-- DBF special *-- DBF special

84
foxbin2prg.prg
View File

@@ -1,5 +1,5 @@
#DEFINE DN_FB2PRG_VERSION 1.21 #DEFINE DN_FB2PRG_VERSION 1.21
#DEFINE DC_FB2PRG_VERSION_REAL '1.21.03' #DEFINE DC_FB2PRG_VERSION_REAL '1.21.04'
*--------------------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------------------
* Module.........: FOXBIN2PRG.PRG - FOR VISUAL FOXPRO 9.0 * Module.........: FOXBIN2PRG.PRG - FOR VISUAL FOXPRO 9.0
@@ -325,6 +325,7 @@
* 19/11/2023 LScheffler v1.21.01 Bug Fix: Problems regenerating databases with splited contents due to the removed Spanish characters in comment. (LScheffler) * 19/11/2023 LScheffler v1.21.01 Bug Fix: Problems regenerating databases with splited contents due to the removed Spanish characters in comment. (LScheffler)
* 03/01/2024 LScheffler v1.21.02 Bug Fix: Problems regenerating single classes and forms from text files in class-per-file form; #105 (LScheffler) * 03/01/2024 LScheffler v1.21.02 Bug Fix: Problems regenerating single classes and forms from text files in class-per-file form; #105 (LScheffler)
* 24/04/2024 LScheffler v1.21.03 Bug Fix: Text To Bin with Fieldcaption = "NULL" (misnomer. it's the field name); #106; #106 (griessbach14943) * 24/04/2024 LScheffler v1.21.03 Bug Fix: Text To Bin with Fieldcaption = "NULL" (misnomer. it's the field name); #106; #106 (griessbach14943)
* 26/08/2024 DHennig v1.21.04 Added support for BodyDevInfo = 2 in CFG file to prevent both DevInfo and ObjRev from being written to PJ2 file
* </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES> * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
* *
*--------------------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------------------
@@ -3135,7 +3136,9 @@ Define Class c_foxbin2prg As Session
*pjx special *pjx special
Case Left( laConfig(m.I), 12 ) == Lower('BodyDevInfo:') Case Left( laConfig(m.I), 12 ) == Lower('BodyDevInfo:')
lcValue = Alltrim( Substr( laConfig(m.I), 13 ) ) lcValue = Alltrim( Substr( laConfig(m.I), 13 ) )
If Inlist( lcValue, '0', '1' ) Then *** DH 2024-08-26: support 2 as a value
* If Inlist( lcValue, '0', '1' ) Then
If Inlist( lcValue, '0', '1', '2' ) Then
lo_CFG.n_BodyDevInfo = Int( Val( lcValue ) ) lo_CFG.n_BodyDevInfo = Int( Val( lcValue ) )
.writeLog( C_TAB + Justfname(lcConfigFile) + ' > BodyDevInfo: ' + Transform(lo_CFG.n_BodyDevInfo) ) .writeLog( C_TAB + Justfname(lcConfigFile) + ' > BodyDevInfo: ' + Transform(lo_CFG.n_BodyDevInfo) )
Endif Endif
@@ -4221,7 +4224,8 @@ Define Class c_foxbin2prg As Session
laOptions(04,1) = "*Debug:" && 0,1 Don't Activate individual <file>.Log by default laOptions(04,1) = "*Debug:" && 0,1 Don't Activate individual <file>.Log by default
laOptions(04,2) = ".n_Debug" laOptions(04,2) = ".n_Debug"
laOptions(04,3) = 0 laOptions(04,3) = 0
laOptions(05,1) = "*BodyDevInfo:" && 0,1 [0=Don't keep DevInfo for body pjx records], 1=Keep DevInfo *** DH 2024-08-26: added text for option 2
laOptions(05,1) = "*BodyDevInfo:" && 0,1 [0=Don't keep DevInfo for body pjx records], 1=Keep DevInfo, 2 = Don't keep DevInfo or ObjRev
laOptions(05,2) = ".n_BodyDevInfo" laOptions(05,2) = ".n_BodyDevInfo"
laOptions(05,3) = 0 laOptions(05,3) = 0
laOptions(06,1) = "*ExtraBackupLevels:" && n By default 1 BAK is created. With this you can make more .N.BAK, or none laOptions(06,1) = "*ExtraBackupLevels:" && n By default 1 BAK is created. With this you can make more .N.BAK, or none
@@ -18495,31 +18499,47 @@ toFoxBin2Prg.n_CheckFileInPath=2
<<>> .ADD('<<loReg.NAME>>') <<>> .ADD('<<loReg.NAME>>')
ENDTEXT ENDTEXT
If toFoxBin2Prg.n_BodyDevInfo=1 *** DH 2024-08-26: changed IF to CASE and added case for BodyDevInfo = 2 meaning omit DEVINFO and OBJREV
* If toFoxBin2Prg.n_BodyDevInfo=1
do case
case toFoxBin2Prg.n_BodyDevInfo=1
* Generates an extra DevInfo tag for each body PJX record * Generates an extra DevInfo tag for each body PJX record
TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2+4+8 TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2+4+8
<<>> <<'&'>><<'&'>> <<C_FILE_META_I>> <<>> <<'&'>><<'&'>> <<C_FILE_META_I>>
Type="<<loReg.TYPE>>" Type="<<loReg.TYPE>>"
Cpid="<<INT( loReg.CPID )>>" Cpid="<<INT( loReg.CPID )>>"
Timestamp="<<INT( loReg.TIMESTAMP )>>" Timestamp="<<INT( loReg.TIMESTAMP )>>"
ID="<<INT( loReg.ID )>>" ID="<<INT( loReg.ID )>>"
ObjRev="<<INT( loReg.OBJREV )>>" ObjRev="<<INT( loReg.OBJREV )>>"
User="<<STRCONV(loReg.USER,13)>>" User="<<STRCONV(loReg.USER,13)>>"
DevInfo="<<STRCONV(loReg.DEVINFO,13)>>" DevInfo="<<STRCONV(loReg.DEVINFO,13)>>"
<<C_FILE_META_F>> <<C_FILE_META_F>>
ENDTEXT ENDTEXT
Else * Else
TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2+4+8 case toFoxBin2Prg.n_BodyDevInfo=2
<<>> <<'&'>><<'&'>> <<C_FILE_META_I>> TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2+4+8
Type="<<loReg.TYPE>>" <<>> <<'&'>><<'&'>> <<C_FILE_META_I>>
Cpid="<<INT( loReg.CPID )>>" Type="<<loReg.TYPE>>"
Timestamp="<<INT( loReg.TIMESTAMP )>>" Cpid="<<INT( loReg.CPID )>>"
ID="<<INT( loReg.ID )>>" Timestamp="<<INT( loReg.TIMESTAMP )>>"
ObjRev="<<INT( loReg.OBJREV )>>" ID="<<INT( loReg.ID )>>"
User="<<STRCONV(loReg.USER,13)>>" User="<<STRCONV(loReg.USER,13)>>"
<<C_FILE_META_F>> <<C_FILE_META_F>>
ENDTEXT ENDTEXT
Endif otherwise
TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2+4+8
<<>> <<'&'>><<'&'>> <<C_FILE_META_I>>
Type="<<loReg.TYPE>>"
Cpid="<<INT( loReg.CPID )>>"
Timestamp="<<INT( loReg.TIMESTAMP )>>"
ID="<<INT( loReg.ID )>>"
ObjRev="<<INT( loReg.OBJREV )>>"
User="<<STRCONV(loReg.USER,13)>>"
<<C_FILE_META_F>>
ENDTEXT
* Endif
endcase
*** DH 2024-08-26: end of changes
loReg = .Null. loReg = .Null.
Endfor Endfor
@@ -19132,6 +19152,7 @@ Define Class c_conversor_pjm_a_prg As c_conversor_bin_a_prg
*-- Definir archivos del proyecto y metadata: CPID, Timestamp, ID, etc. *-- Definir archivos del proyecto y metadata: CPID, Timestamp, ID, etc.
loProject.KeySort = 2 loProject.KeySort = 2
messagebox('convert')
For Each loReg In loProject &&FOXOBJECT For Each loReg In loProject &&FOXOBJECT
TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
<<>> .ADD('<<loReg.NAME>>') <<>> .ADD('<<loReg.NAME>>')
@@ -31670,6 +31691,7 @@ Define Class CL_LANG As Custom
<<>> <<>>
ENDTEXT ENDTEXT
*** DH 2021-03-04: added HomeDir to text *** DH 2021-03-04: added HomeDir to text
*** DH 2024-08-26: added text for option 2 for BodyDevInfo
.C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_Header4 = "*Options for folder <<.c_Recompile>>, read as of <<DATETIME()>>" .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_Header4 = "*Options for folder <<.c_Recompile>>, read as of <<DATETIME()>>"
TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2 TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
<<>>################################################################################################################ <<>>################################################################################################################
@@ -31811,7 +31833,7 @@ Define Class CL_LANG As Custom
<<>>---------------------------------------------------------------------------------------------------------------- <<>>----------------------------------------------------------------------------------------------------------------
<<>> <<>>
<<>>-- PJX special <<>>-- PJX special
<<>>BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo <<>>BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo, 2 = Don't keep DevInfo or ObjRev
<<>>---------------------------------------------------------------------------------------------------------------- <<>>----------------------------------------------------------------------------------------------------------------
<<>> <<>>
<<>>-- DBF special <<>>-- DBF special
@@ -32019,6 +32041,7 @@ Define Class CL_LANG As Custom
<<>> <<>>
ENDTEXT ENDTEXT
*** DH 2021-03-04: added HomeDir to text *** DH 2021-03-04: added HomeDir to text
*** DH 2024-08-26: added text for option 2 for BodyDevInfo
.C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_Header4 = "*Options for folder <<.c_Recompile>>, read as of <<DATETIME()>>" .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_Header4 = "*Options for folder <<.c_Recompile>>, read as of <<DATETIME()>>"
TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2 TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
<<>>################################################################################################################ <<>>################################################################################################################
@@ -32160,7 +32183,7 @@ Define Class CL_LANG As Custom
<<>>---------------------------------------------------------------------------------------------------------------- <<>>----------------------------------------------------------------------------------------------------------------
<<>> <<>>
<<>>-- PJX special <<>>-- PJX special
<<>>BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo <<>>BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo, 2 = Don't keep DevInfo or ObjRev
<<>>---------------------------------------------------------------------------------------------------------------- <<>>----------------------------------------------------------------------------------------------------------------
<<>> <<>>
<<>>-- DBF special <<>>-- DBF special
@@ -32745,6 +32768,7 @@ Define Class CL_LANG As Custom
<<>> <<>>
ENDTEXT ENDTEXT
*** DH 2021-03-04: added HomeDir to text *** DH 2021-03-04: added HomeDir to text
*** DH 2024-08-26: added text for option 2 for BodyDevInfo
.C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_Header4 = "*Options for folder <<.c_Recompile>>, read as of <<DATETIME()>>" .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_Header4 = "*Options for folder <<.c_Recompile>>, read as of <<DATETIME()>>"
TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2 TEXT TO .C_FOXBIN2PRG_SYNTAX_INFO_EXAMPLE_LOC_cfg TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
<<>>################################################################################################################ <<>>################################################################################################################
@@ -32886,7 +32910,7 @@ Define Class CL_LANG As Custom
<<>>---------------------------------------------------------------------------------------------------------------- <<>>----------------------------------------------------------------------------------------------------------------
<<>> <<>>
<<>>-- PJX special <<>>-- PJX special
<<>>BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo <<>>BodyDevInfo: 0 && 0=Don't keep DevInfo for body pjx records, 1=Keep DevInfo, 2 = Don't keep DevInfo or ObjRev
<<>>---------------------------------------------------------------------------------------------------------------- <<>>----------------------------------------------------------------------------------------------------------------
<<>> <<>>
<<>>-- DBF special <<>>-- DBF special