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

BugFix: Converting DBFs on simulated run

Browse Source 
If .l_ProcessFiles was true, conversion of DBF's failed
Additional some minor improvements on german translation
This commit is contained in:
Lutz
2021-02-14 12:41:44 +01:00
parent 8b99f8dbf8
commit c31b810665
1 changed files with 184 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
foxbin2prg.prg
View File

@@ -225,6 +225,9 @@
* 01/04/2020 DH v1.19.51 Bug Fix: Manejo de AutoIncrement incompatible con Project Explorer (Dan Lauer)
* 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/21 Lutz Scheffler conversion dbf -> prg, error if only test mode (toFoxBin2Prg.l_ProcessFiles is false)
* minor translations
* </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
*
*---------------------------------------------------------------------------------------------------
@@ -2137,6 +2140,7 @@ DEFINE CLASS c_foxbin2prg AS Session
ELSE
.writeLog( '> ' + UPPER(loLang.C_CACHING_CONFIG_FOR_DIRECTORY_LOC) + ': ' + lc_CFG_Path )
lo_CFG = CREATEOBJECT('CL_CFG')
lo_Configuration.Add( lo_CFG, lc_CFG_Path )
.n_CFG_Actual = lo_Configuration.Count
@@ -13022,7 +13026,6 @@ DEFINE CLASS c_conversor_prg_a_dbf AS c_conversor_prg_a_bin
ENDDEFINE && CLASS c_conversor_prg_a_dbf AS c_conversor_prg_a_bin
DEFINE CLASS c_conversor_prg_a_dbc AS c_conversor_prg_a_bin
#IF .F.
LOCAL THIS AS c_conversor_prg_a_dbc OF 'FOXBIN2PRG.PRG'
@@ -17482,12 +17485,29 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
#ENDIF
DODEFAULT( @toModulo, @toEx, @toFoxBin2Prg )
*!* Changed by: Lutz Scheffler 11.2.2021
*!* change date="{^2021-02-11,08:50:00}"
* If toFoxBin2Prg.l_ProcessFiles is not true
* and the try block was exited
* the stuff below was never instatiated
*so the whole try / catch block should not run
IF NOT toFoxBin2Prg.l_ProcessFiles THEN
THIS.write_OutputFile( '', THIS.c_OutputFile, @toFoxBin2Prg )
ELSE &&NOT toFoxBin2Prg.l_ProcessFiles
*!* /Changed by: Lutz Scheffler 11.2.2021
TRY
WITH THIS AS c_conversor_dbf_a_prg OF 'FOXBIN2PRG.PRG'
IF NOT toFoxBin2Prg.l_ProcessFiles THEN
.write_OutputFile( '', .c_OutputFile, @toFoxBin2Prg )
EXIT && Si se indicó no procesar, se sale aquí. (Modo de simulación)
ENDIF
*!* Changed by: Lutz Scheffler 11.2.2021
*!* change date="{^2021-02-11,08:50:00}"
*moved up:
* IF NOT toFoxBin2Prg.l_ProcessFiles THEN
* .write_OutputFile( '', .c_OutputFile, @toFoxBin2Prg )
* EXIT && Si se indicó no procesar, se sale aquí. (Modo de simulación)
* ENDIF
*!* /Changed by: Lutz Scheffler 11.2.2021
LOCAL lnCodError, laDatabases(1), lnDatabases_Count, laDatabases2(1) ;
, lnLen, lc_FileTypeDesc, laLines(1), lcOutputFile ;
@@ -17654,11 +17674,23 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
ENDFOR
STORE NULL TO loTable, loDBFUtils, loTextStream, toFoxBin2Prg.o_TextStream
RELEASE toModulo, toEx, toFoxBin2Prg, loTextStream ;
*!* Changed by: Lutz Scheffler 11.2.2021
*!* change date="{^2021-02-11,08:50:00}"
* Release different, parts moved outsidef IF .. ENDIF
RELEASE loTextStream ;
, lnCodError, laDatabases, lnDatabases_Count, laDatabases2, lnLen, lc_FileTypeDesc ;
, ln_HexFileType, ll_FileHasCDX, ll_FileHasMemo, ll_FileIsDBC, lc_DBC_Name, lnDataSessionID, lnSelect ;
, loTable, loDBFUtils
ENDTRY
*!* Changed by: Lutz Scheffler 11.2.2021
*!* change date="{^2021-02-11,08:50:00}"
* so the whole try / catch block should not run if in simulation
ENDIF &&NOT toFoxBin2Prg.l_ProcessFiles
* Release from above
RELEASE toModulo, toEx, toFoxBin2Prg, loTextStream ;
*!* /Changed by: Lutz Scheffler 11.2.2021
RETURN
ENDPROC
@@ -17828,9 +17860,9 @@ DEFINE CLASS c_conversor_dbc_a_prg AS c_conversor_bin_a_prg
*ENDFOR
*toDatabase = lcCodigo
ELSE
IF toFoxBin2Prg.n_UseClassPerFile > 0 THEN
.write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg )
FOR I = 1 TO lnClassCount
* lcOutputFile = '<path>DBCName' + '.' + 'MemberType' + '.' + 'MemberName' + '.' + 'dc2'
lcOutputFile = ADDBS( JUSTPATH( .c_OutputFile ) ) + JUSTSTEM( .c_OutputFile ) + '.' + laClasses(m.I,3) + '.' + laClasses(m.I,1) + '.' + JUSTEXT( .c_OutputFile )
@@ -29067,7 +29099,7 @@ DEFINE CLASS CL_LANG AS Custom
.C_CACHING_CONFIG_FOR_DIRECTORY_LOC = "Caching Config für Verzeichnis"
.C_CANT_GENERATE_FILE_BECAUSE_IT_IS_READONLY_LOC = "Kann Datei [<<THIS.c_OutputFile>>] nicht generieren, da sie schreibgeschützt ist"
.C_CLASSPERFILE_OPTIMIZATION_BASE_ALREADY_PROCESSED_LOC = "Optimierung: Grund Datei [<<JUSTFNAME(.c_InputFile)>>] Schon verarbeitet, das Überspringen Verarbeitung der Datei [<<tc_InputFile>>]"
.C_CONFIGFILE_LOC = "Benutze Konfigurationsdatei:"
.C_CONFIGFILE_LOC = "Benutzte Konfigurationsdatei:"
.C_CONVERSION_CANCELLED_BY_USER_LOC = "Konvertierung durch den Benutzer abgebrochen"
.C_CONVERT_ALL_FILES_IN_A_PROJECT_LOC = "alle Dateien in einem Projekt zu konvertieren"
.C_CONVERT_FOLDER_LOC = "Konvertieren Verzeichnis"
@@ -29205,7 +29237,7 @@ DEFINE CLASS CL_LANG AS Custom
.C_PROCESSING_LOC = "Bearbeite Datei"
.C_PROCESS_PROGRESS_LOC = "Bearbeitungsfortschritt:"
.C_PROPERTY_NAME_NOT_RECOGNIZED_LOC = "Eigenschaft [<<TRANSFORM(tnPropertyID)>>] nicht erkannt."
.C_READING_CFG_VALUES_FROM_DISK_LOC = "LESEWERTE CFG-DATEI AUF DER FESTPLATTE"
.C_READING_CFG_VALUES_FROM_DISK_LOC = "Gelesene Werte der CFG-DATEI von der Festplatte"
.C_REPORT_NOT_IN_VFP9_FORMAT_LOC = "Report [<<THIS.c_InputFile>>] ist NICHT in VFP 9 Format! - Bitte zuerst nach VFP 9 konvertieren mit MODIFY REPORT '<<THIS.c_InputFile>>'"
.C_REQUESTING_CAPITALIZATION_OF_FILE_LOC = "- Forder Großschreibung für Datei [<<tcFileName>>] an"
.C_SCANNING_FILE_AND_DIR_INFO_LOC = "Scanne Datei- und Verzeichnisinformationen für"