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

Merge branch 'fix' into mod

Browse Source
This commit is contained in:
Lutz
2021-02-15 14:21:08 +01:00
parent 2ce11bf480 1efaceee19
commit c9fd4328c1
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
foxbin2prg.prg
View File

@@ -226,11 +226,17 @@
* 01/04/2020 FDBOZZO v1.19.51 Bug Fix: La conversión de tablas falla si algún campo contiene una palabra reservada como UNIQUE (DAJU78)
* 01/04/2020 FDBOZZO v1.19.51 Bug Fix: No se respetan las propiedades de VCX/SCX con nombre "note" (Tracy Pearson)
* 14/02/2021 Lutz Scheffler conversion prg -> dbf, fields with .NULL. value are incorectly recreated
* minor translations
* fixes
* 14/02/2021 Lutz Scheffler conversion dbf -> prg, error if only test mode (toFoxBin2Prg.l_ProcessFiles is false)
* minor translations
* 14/02/2021 Lutz Scheffler conversion prg -> dbf, fields with .NULL. value are incorectly recreated
* 15/02/2021 Lutz Scheffler processing directory, flush log file after loop instead of file
* xx/02/2021 Lutz Scheffler proposed: conversion prg -> vcx, files per class could create one class multiple times
* mods
* 14/02/2021 Lutz Scheffler inserted option UseFilesPerDBC to split DBC processing from vcx / scx
* xx/xx/2021 Lutz Scheffler inserted option RedirectFilePerDBCToMain to split DBC processing from vcx / scx
* xx/xx/2021 Lutz Scheffler inserted option UseDBFPerDBC to create tables by selecting DBC only
* </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
*
*---------------------------------------------------------------------------------------------------
@@ -3320,7 +3326,12 @@ DEFINE CLASS c_foxbin2prg AS Session
.updateProgressbar( loLang.C_PROCESSING_LOC + ' ' + lcFile + '...', m.I, lnFileCount, 0 )
lnCodError = .convert( lcFile, @toModulo, @toEx, .F., tcOriginalFileName )
.writeLog_Flush()
*!* Changed by: Lutz Scheffler 15.2.2021
*!* change date="{^2021-02-15,06:57:00}"
* flushing the log after each file let us only see last file
* .writeLog_Flush() moved after ENDFOR
* .writeLog_Flush()
DO CASE
CASE lnCodError = 1799 && Conversion Cancelled
@@ -3330,6 +3341,8 @@ DEFINE CLASS c_foxbin2prg AS Session
.doWriteErrorLog( @toEx )
ENDCASE
ENDFOR && I = 1 TO lnFileCount
.writeLog_Flush()
*!* /Changed by: Lutz Scheffler 15.2.2021
.updateProgressbar( loLang.C_END_OF_PROCESS_LOC, lnFileCount, lnFileCount, 0 )
EXIT
@@ -3371,6 +3384,7 @@ DEFINE CLASS c_foxbin2prg AS Session
.get_FilesFromDirectory( tc_InputFile, @laFiles, @lnFileCount )
FOR I = 1 TO lnFileCount
toModulo = NULL
lcFile = laFiles(m.I)
@@ -3381,7 +3395,12 @@ DEFINE CLASS c_foxbin2prg AS Session
.updateProgressbar( loLang.C_PROCESSING_LOC + ' ' + lcFile + '...', m.I, lnFileCount, 0 )
lnCodError = .convert( lcFile, @toModulo, @toEx, .F., tcOriginalFileName )
.writeLog_Flush()
*!* Changed by: Lutz Scheffler 15.2.2021
*!* change date="{^2021-02-15,06:57:00}"
* flushing the log after each file let us only see last file
* .writeLog_Flush() moved after ENDFOR
* .writeLog_Flush()
DO CASE
CASE lnCodError = 1799 && Conversion Cancelled
@@ -3391,6 +3410,8 @@ DEFINE CLASS c_foxbin2prg AS Session
.doWriteErrorLog( @toEx )
ENDCASE
ENDFOR && I = 1 TO lnFileCount
.writeLog_Flush()
*!* /Changed by: Lutz Scheffler 15.2.2021
.updateProgressbar( loLang.C_END_OF_PROCESS_LOC, lnFileCount, lnFileCount, 0 )
EXIT
@@ -4607,14 +4628,14 @@ DEFINE CLASS c_foxbin2prg AS Session
PROCEDURE get_FilesFromDirectory
LPARAMETERS tcDir, taFiles, lnFileCount
LPARAMETERS tcDir, taFiles, tnFileCount
EXTERNAL ARRAY taFiles
LOCAL laFiles(1), I, lnFiles ;
, loLang as CL_LANG OF 'FOXBIN2PRG.PRG'
IF TYPE("ALEN(laFiles)") # "N" OR EMPTY(lnFileCount)
lnFileCount = 0
IF TYPE("ALEN(laFiles)") # "N" OR EMPTY(tnFileCount)
tnFileCount = 0
DIMENSION taFiles(1)
ENDIF
@@ -4631,9 +4652,10 @@ DEFINE CLASS c_foxbin2prg AS Session
IF SUBSTR( laFiles(m.I,5), 5, 1 ) == 'D'
LOOP
ENDIF
lnFileCount = lnFileCount + 1
DIMENSION taFiles(lnFileCount)
taFiles(lnFileCount) = tcDir + laFiles(m.I,1)
tnFileCount = tnFileCount + 1
DIMENSION taFiles(tnFileCount)
taFiles(tnFileCount) = tcDir + laFiles(m.I,1)
ENDFOR
*-- Busco los subdirectorios