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

Changeset: 530 fdbozzo - 29/11/2014 17:16:34:

Browse Source 
- Agregado control para detectar reportes no compatibles con VFP 9
- Agregada posibilidad de cancelar proceso con tecla Esc
- Varias mejoras al indicador de progreso
- Adaptados los scripts vbs para el nuevo funcionamiento del indicador de progreso y cancelación
This commit is contained in:
fdbozzo
2014-11-30 16:32:35 +01:00
parent 5af062db63
commit d464d6541c
6 changed files with 251 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Convert_VFP9_BIN_2_PRG.vbs
View File

@@ -15,7 +15,7 @@
Const ForReading = 1 Const ForReading = 1
Dim WSHShell, FileSystemObject Dim WSHShell, FileSystemObject
Dim oVFP9, nExitCode, cEXETool, cCMD, nDebug, lcExt, foxbin2prg_cfg, aFiles(), nFile_Count Dim oVFP9, nExitCode, cEXETool, cCMD, nDebug, lcExt, foxbin2prg_cfg, aFiles(), nFile_Count
Dim i, x, str_cfg, aConf, cErrMsg, cFlagGenerateLog, cFlagDontShowErrMsg, cFlagJustShowCall, cFlagRecompile, cNoTimestamps, cErrFile Dim i, x, str_cfg, aConf, cErrMsg, cFlagGenerateLog, cFlagDontShowErrMsg, cFlagJustShowCall, cFlagRecompile, cFlagNoTimestamps, cErrFile
Set WSHShell = WScript.CreateObject("WScript.Shell") Set WSHShell = WScript.CreateObject("WScript.Shell")
Set FileSystemObject = WScript.CreateObject("Scripting.FileSystemObject") Set FileSystemObject = WScript.CreateObject("Scripting.FileSystemObject")
Set oVFP9 = CreateObject("VisualFoxPro.Application.9") Set oVFP9 = CreateObject("VisualFoxPro.Application.9")
@@ -59,8 +59,6 @@ Else
oVFP9.DoCmd( "SET PROCEDURE TO '" & cEXETool & "'" ) oVFP9.DoCmd( "SET PROCEDURE TO '" & cEXETool & "'" )
oVFP9.DoCmd( "PUBLIC oFoxBin2prg" ) oVFP9.DoCmd( "PUBLIC oFoxBin2prg" )
oVFP9.DoCmd( "oFoxBin2prg = CREATEOBJECT('c_foxbin2prg')" ) oVFP9.DoCmd( "oFoxBin2prg = CREATEOBJECT('c_foxbin2prg')" )
'.o_FoxBin2Prg.EvaluarConfiguracion( tcDontShowProgress, tcDontShowErrors, tcNoTimestamps, tcDebug, tcRecompile, tcExtraBackupLevels )
oVFP9.DoCmd( "oFoxBin2prg.EvaluarConfiguracion( '1', '1' )" )
oVFP9.DoCmd( "oFoxBin2prg.cargar_frm_avance()" ) oVFP9.DoCmd( "oFoxBin2prg.cargar_frm_avance()" )
For i = 0 To WScript.Arguments.Count-1 For i = 0 To WScript.Arguments.Count-1
@@ -82,17 +80,11 @@ Else
cFlagDontShowErrMsg = "'1'" cFlagDontShowErrMsg = "'1'"
End If End If
If GetBit(nDebug, 5) Then If GetBit(nDebug, 5) Then
cNoTimestamps = "'1'" cFlagNoTimestamps = "'1'"
End If End If
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.nMAX_VALUE = " & nFile_Count )
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.nVALUE = " & 0 )
'oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.AlwaysOnTop = .T." )
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.SHOW()" )
For i = 1 To nFile_Count For i = 1 To nFile_Count
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.lbl_TAREA.CAPTION = oFoxBin2Prg.c_loc_processing_file + ' " & aFiles(i) & "...'" ) oVFP9.DoCmd( "oFoxBin2Prg.AvanceDelProceso(oFoxBin2Prg.c_loc_processing_file + ' " & aFiles(i) & "...', " & i & ", " & nFile_Count & ", 0)" )
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.nVALUE = " & i )
cFlagRecompile = "'" & FileSystemObject.GetParentFolderName( aFiles(i) ) & "'" cFlagRecompile = "'" & FileSystemObject.GetParentFolderName( aFiles(i) ) & "'"
If nDebug = 0 Or nDebug = 2 Then If nDebug = 0 Or nDebug = 2 Then
@@ -100,22 +92,30 @@ Else
Else Else
cCMD = "oFoxBin2prg.ejecutar( '" & aFiles(i) & "','0','0','0'," _ cCMD = "oFoxBin2prg.ejecutar( '" & aFiles(i) & "','0','0','0'," _
& cFlagDontShowErrMsg & "," & cFlagGenerateLog & ",'1','','',.F.,''," _ & cFlagDontShowErrMsg & "," & cFlagGenerateLog & ",'1','','',.F.,''," _
& cFlagRecompile & "," & cNoTimestamps & " )" & cFlagRecompile & "," & cFlagNoTimestamps & " )"
End If End If
If cFlagJustShowCall = "1" Then If cFlagJustShowCall = "1" Then
MsgBox cCMD, 64, "PARAMETERS" MsgBox cCMD, 64, "PARAMETERS"
Else Else
oVFP9.DoCmd( cCMD ) oVFP9.DoCmd( cCMD )
nExitCode = oVFP9.Eval("_SCREEN.ExitCode") nExitCode = oVFP9.Eval("_SCREEN.ExitCode")
End If End If
If nExitCode = 1799 Then 'Conversion cancelled by user
Exit For
End If
Next Next
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.HIDE()" )
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance = NULL" )
If GetBit(nDebug, 4) Then If GetBit(nDebug, 4) Then
If oVFP9.Eval("oFoxBin2prg.l_Error") Then 'If oVFP9.Eval("oFoxBin2prg.l_Error") Then
If nExitCode = 1799 Then
MsgBox "Conversion Cancelled by User!", 48, WScript.ScriptName
cErrFile = oVFP9.Eval("FORCEPATH('FoxBin2Prg.LOG',GETENV('TEMP') )")
oVFP9.DoCmd("STRTOFILE( oFoxBin2prg.c_ErrorLog, '" & cErrFile & "' )")
WSHShell.run cErrFile
ElseIf nExitCode > 0 Then
MsgBox "End of Process! (with errors)", 48, WScript.ScriptName MsgBox "End of Process! (with errors)", 48, WScript.ScriptName
cErrFile = oVFP9.Eval("FORCEPATH('FoxBin2Prg.LOG',GETENV('TEMP') )") cErrFile = oVFP9.Eval("FORCEPATH('FoxBin2Prg.LOG',GETENV('TEMP') )")
oVFP9.DoCmd("STRTOFILE( oFoxBin2prg.c_ErrorLog, '" & cErrFile & "' )") oVFP9.DoCmd("STRTOFILE( oFoxBin2prg.c_ErrorLog, '" & cErrFile & "' )")
@@ -126,15 +126,18 @@ Else
End If End If
oVFP9.DoCmd( "oFoxBin2prg = NULL" ) oVFP9.DoCmd( "oFoxBin2prg = NULL" )
oVFP9.DoCmd( "CLEAR ALL" )
Set oVFP9 = Nothing
End If End If
WScript.Quit(nExitCode) WScript.Quit nExitCode
Private Sub scanDirs( tcArgument ) Private Sub scanDirs( tcArgument )
Dim omFolder, oFolder Dim omFolder, oFolder
If FileSystemObject.FolderExists( tcArgument ) Then If FileSystemObject.FolderExists( tcArgument ) Then
'-- Es un directorio '-- Es un directorio
oVFP9.DoCmd( "oFoxBin2Prg.AvanceDelProceso('Scanning file and directory information on " & tcArgument & "...', 0, 0, 0)" )
Set omFolder = FileSystemObject.GetFolder( tcArgument ) Set omFolder = FileSystemObject.GetFolder( tcArgument )
For Each oFile IN omFolder.Files For Each oFile IN omFolder.Files
evaluateFile( oFile.Path ) evaluateFile( oFile.Path )
@@ -152,7 +155,11 @@ End Sub
Private Sub evaluateFile( tcFile ) Private Sub evaluateFile( tcFile )
lcExt = UCase( FileSystemObject.GetExtensionName( tcFile ) ) lcExt = UCase( FileSystemObject.GetExtensionName( tcFile ) )
oVFP9.SetVar "gc_Ext", lcExt oVFP9.SetVar "gc_Ext", lcExt
oVFP9.DoCmd( "oFoxBin2prg.EvaluarConfiguracion( '', '', '', '', '', '', '', '', '" & tcFile & "' )" ) oVFP9.DoCmd( "oFoxBin2prg.EvaluarConfiguracion( '1', '1', '', '', '', '', '', '', '" & tcFile & "' )" )
'PROCEDURE EvaluarConfiguracion
' LPARAMETERS tcDontShowProgress, tcDontShowErrors, tcFlagNoTimestamps, tcDebug, tcRecompile, tcExtraBackupLevels ;
' , tcClearUniqueID, tcOptimizeByFilestamp, tc_InputFile
If oVFP9.Eval("oFoxBin2prg.TieneSoporte_Bin2Prg(gc_Ext)") Then If oVFP9.Eval("oFoxBin2prg.TieneSoporte_Bin2Prg(gc_Ext)") Then
nFile_Count = nFile_Count + 1 nFile_Count = nFile_Count + 1
ReDim Preserve aFiles(nFile_Count) ReDim Preserve aFiles(nFile_Count)

47
Convert_VFP9_PRG_2_BIN.vbs
View File

@@ -15,7 +15,7 @@
Const ForReading = 1 Const ForReading = 1
Dim WSHShell, FileSystemObject Dim WSHShell, FileSystemObject
Dim oVFP9, nExitCode, cEXETool, cCMD, nDebug, lcExt, foxbin2prg_cfg, aFiles(), nFile_Count Dim oVFP9, nExitCode, cEXETool, cCMD, nDebug, lcExt, foxbin2prg_cfg, aFiles(), nFile_Count
Dim i, x, str_cfg, aConf, cErrMsg, cFlagGenerateLog, cFlagDontShowErrMsg, cFlagJustShowCall, cFlagRecompile, cNoTimestamps, cErrFile Dim i, x, str_cfg, aConf, cErrMsg, cFlagGenerateLog, cFlagDontShowErrMsg, cFlagJustShowCall, cFlagRecompile, cFlagNoTimestamps, cErrFile
Set WSHShell = WScript.CreateObject("WScript.Shell") Set WSHShell = WScript.CreateObject("WScript.Shell")
Set FileSystemObject = WScript.CreateObject("Scripting.FileSystemObject") Set FileSystemObject = WScript.CreateObject("Scripting.FileSystemObject")
Set oVFP9 = CreateObject("VisualFoxPro.Application.9") Set oVFP9 = CreateObject("VisualFoxPro.Application.9")
@@ -59,8 +59,6 @@ Else
oVFP9.DoCmd( "SET PROCEDURE TO '" & cEXETool & "'" ) oVFP9.DoCmd( "SET PROCEDURE TO '" & cEXETool & "'" )
oVFP9.DoCmd( "PUBLIC oFoxBin2prg" ) oVFP9.DoCmd( "PUBLIC oFoxBin2prg" )
oVFP9.DoCmd( "oFoxBin2prg = CREATEOBJECT('c_foxbin2prg')" ) oVFP9.DoCmd( "oFoxBin2prg = CREATEOBJECT('c_foxbin2prg')" )
'.o_FoxBin2Prg.EvaluarConfiguracion( tcDontShowProgress, tcDontShowErrors, tcNoTimestamps, tcDebug, tcRecompile, tcExtraBackupLevels )
oVFP9.DoCmd( "oFoxBin2prg.EvaluarConfiguracion( '1', '1' )" )
oVFP9.DoCmd( "oFoxBin2prg.cargar_frm_avance()" ) oVFP9.DoCmd( "oFoxBin2prg.cargar_frm_avance()" )
For i = 0 To WScript.Arguments.Count-1 For i = 0 To WScript.Arguments.Count-1
@@ -77,7 +75,6 @@ Else
cFlagGenerateLog = "'0'" cFlagGenerateLog = "'0'"
cFlagDontShowErrMsg = "'0'" cFlagDontShowErrMsg = "'0'"
cFlagShowCall = "'0'" cFlagShowCall = "'0'"
'cFlagRecompile = "'1'"
If GetBit(nDebug, 1) Then If GetBit(nDebug, 1) Then
cFlagGenerateLog = "'1'" cFlagGenerateLog = "'1'"
@@ -89,17 +86,11 @@ Else
cFlagDontShowErrMsg = "'1'" cFlagDontShowErrMsg = "'1'"
End If End If
If GetBit(nDebug, 5) Then If GetBit(nDebug, 5) Then
cNoTimestamps = "'1'" cFlagNoTimestamps = "'1'"
End If End If
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.nMAX_VALUE = " & nFile_Count )
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.nVALUE = " & 0 )
'oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.AlwaysOnTop = .T." )
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.SHOW()" )
For i = 1 To nFile_Count For i = 1 To nFile_Count
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.lbl_TAREA.CAPTION = oFoxBin2Prg.c_loc_processing_file + ' " & aFiles(i) & "...'" ) oVFP9.DoCmd( "oFoxBin2Prg.AvanceDelProceso(oFoxBin2Prg.c_loc_processing_file + ' " & aFiles(i) & "...', " & i & ", " & nFile_Count & ", 0)" )
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.nVALUE = " & i )
cFlagRecompile = "'" & FileSystemObject.GetParentFolderName( aFiles(i) ) & "'" cFlagRecompile = "'" & FileSystemObject.GetParentFolderName( aFiles(i) ) & "'"
If nDebug = 0 Or nDebug = 2 Then If nDebug = 0 Or nDebug = 2 Then
@@ -107,22 +98,30 @@ Else
Else Else
cCMD = "oFoxBin2prg.ejecutar( '" & aFiles(i) & "','0','0','0'," _ cCMD = "oFoxBin2prg.ejecutar( '" & aFiles(i) & "','0','0','0'," _
& cFlagDontShowErrMsg & "," & cFlagGenerateLog & ",'1','','',.F.,''," _ & cFlagDontShowErrMsg & "," & cFlagGenerateLog & ",'1','','',.F.,''," _
& cFlagRecompile & "," & cNoTimestamps & " )" & cFlagRecompile & "," & cFlagNoTimestamps & " )"
End If End If
If cFlagJustShowCall = "1" Then If cFlagJustShowCall = "1" Then
MsgBox cCMD, 64, "PARAMETERS" MsgBox cCMD, 64, "PARAMETERS"
Else Else
oVFP9.DoCmd( cCMD ) oVFP9.DoCmd( cCMD )
nExitCode = oVFP9.Eval("_SCREEN.ExitCode") nExitCode = oVFP9.Eval("_SCREEN.ExitCode")
End If End If
If nExitCode = 1799 Then 'Conversion cancelled by user
Exit For
End If
Next Next
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance.HIDE()" )
oVFP9.DoCmd( "oFoxBin2prg.o_Frm_Avance = NULL" )
If GetBit(nDebug, 4) Then If GetBit(nDebug, 4) Then
If oVFP9.Eval("oFoxBin2prg.l_Error") Then 'If oVFP9.Eval("oFoxBin2prg.l_Error") Then
If nExitCode = 1799 Then
MsgBox "Conversion Cancelled by User!", 48, WScript.ScriptName
cErrFile = oVFP9.Eval("FORCEPATH('FoxBin2Prg.LOG',GETENV('TEMP') )")
oVFP9.DoCmd("STRTOFILE( oFoxBin2prg.c_ErrorLog, '" & cErrFile & "' )")
WSHShell.run cErrFile
ElseIf nExitCode > 0 Then
MsgBox "End of Process! (with errors)", 48, WScript.ScriptName MsgBox "End of Process! (with errors)", 48, WScript.ScriptName
cErrFile = oVFP9.Eval("FORCEPATH('FoxBin2Prg.LOG',GETENV('TEMP') )") cErrFile = oVFP9.Eval("FORCEPATH('FoxBin2Prg.LOG',GETENV('TEMP') )")
oVFP9.DoCmd("STRTOFILE( oFoxBin2prg.c_ErrorLog, '" & cErrFile & "' )") oVFP9.DoCmd("STRTOFILE( oFoxBin2prg.c_ErrorLog, '" & cErrFile & "' )")
@@ -133,15 +132,18 @@ Else
End If End If
oVFP9.DoCmd( "oFoxBin2prg = NULL" ) oVFP9.DoCmd( "oFoxBin2prg = NULL" )
oVFP9.DoCmd( "CLEAR ALL" )
Set oVFP9 = Nothing
End If End If
WScript.Quit(nExitCode) WScript.Quit nExitCode
Private Sub scanDirs( tcArgument ) Private Sub scanDirs( tcArgument )
Dim omFolder, oFolder Dim omFolder, oFolder
If FileSystemObject.FolderExists( tcArgument ) Then If FileSystemObject.FolderExists( tcArgument ) Then
'-- Es un directorio '-- Es un directorio
oVFP9.DoCmd( "oFoxBin2Prg.AvanceDelProceso('Scanning file and directory information on " & tcArgument & "...', 0, 0, 0)" )
Set omFolder = FileSystemObject.GetFolder( tcArgument ) Set omFolder = FileSystemObject.GetFolder( tcArgument )
For Each oFile IN omFolder.Files For Each oFile IN omFolder.Files
evaluateFile( oFile.Path ) evaluateFile( oFile.Path )
@@ -160,16 +162,15 @@ Private Sub evaluateFile( tcFile )
lcExt = UCase( FileSystemObject.GetExtensionName( tcFile ) ) lcExt = UCase( FileSystemObject.GetExtensionName( tcFile ) )
lcFileName = FileSystemObject.GetFileName( tcFile ) lcFileName = FileSystemObject.GetFileName( tcFile )
laPoints = Split( lcFileName, "." ) laPoints = Split( lcFileName, "." )
lnPoints = UBound(laPoint) lnPoints = UBound(laPoints)
'-- No proceso los archivos con m<>s de un punto (clases en archivos individuales) por performance '-- No proceso los archivos con m<>s de un punto (clases en archivos individuales) por performance
If lnPoints = 1 Then If lnPoints = 1 Then
oVFP9.SetVar "gc_Ext", lcExt oVFP9.SetVar "gc_Ext", lcExt
'PROCEDURE EvaluarConfiguracion 'PROCEDURE EvaluarConfiguracion
' LPARAMETERS tcDontShowProgress, tcDontShowErrors, tcNoTimestamps, tcDebug, tcRecompile, tcExtraBackupLevels ; ' LPARAMETERS tcDontShowProgress, tcDontShowErrors, tcFlagNoTimestamps, tcDebug, tcRecompile, tcExtraBackupLevels ;
' , tcClearUniqueID, tcOptimizeByFilestamp, tc_InputFile ' , tcClearUniqueID, tcOptimizeByFilestamp, tc_InputFile
oVFP9.DoCmd( "oFoxBin2prg.EvaluarConfiguracion( '1', '1', '', '', '', '', '', '', '" & tcFile & "' )" )
oVFP9.DoCmd( "oFoxBin2prg.EvaluarConfiguracion( '', '', '', '', '', '', '', '', '" & tcFile & "' )" )
If oVFP9.Eval("oFoxBin2prg.TieneSoporte_Prg2Bin(gc_Ext)") Then If oVFP9.Eval("oFoxBin2prg.TieneSoporte_Prg2Bin(gc_Ext)") Then
nFile_Count = nFile_Count + 1 nFile_Count = nFile_Count + 1
ReDim Preserve aFiles(nFile_Count) ReDim Preserve aFiles(nFile_Count)

6
VFP9_FoxBin2Prg.vbs
View File

@@ -61,7 +61,7 @@ Else
oVFP9.DoCmd( "SET PROCEDURE TO '" & cEXETool & "'" ) oVFP9.DoCmd( "SET PROCEDURE TO '" & cEXETool & "'" )
oVFP9.DoCmd( "PUBLIC oFoxBin2prg" ) oVFP9.DoCmd( "PUBLIC oFoxBin2prg" )
oVFP9.DoCmd( "oFoxBin2prg = CREATEOBJECT('c_foxbin2prg')" ) oVFP9.DoCmd( "oFoxBin2prg = CREATEOBJECT('c_foxbin2prg')" )
oVFP9.DoCmd( "oFoxBin2prg.EvaluarConfiguracion( '1', '1' )" ) oVFP9.DoCmd( "oFoxBin2prg.cargar_frm_avance()" )
cFlagGenerateLog = "'0'" cFlagGenerateLog = "'0'"
cFlagDontShowErrMsg = "'0'" cFlagDontShowErrMsg = "'0'"
@@ -87,7 +87,7 @@ Else
cCMD = "oFoxBin2prg.ejecutar( '" & WScript.Arguments(0) & "' )" cCMD = "oFoxBin2prg.ejecutar( '" & WScript.Arguments(0) & "' )"
Else Else
cCMD = "oFoxBin2prg.ejecutar( '" & WScript.Arguments(0) & "','0','0','0'," _ cCMD = "oFoxBin2prg.ejecutar( '" & WScript.Arguments(0) & "','0','0','0'," _
& cFlagDontShowErrMsg & "," & cFlagGenerateLog & ",'1','','',.F.,''," _ & cFlagDontShowErrMsg & "," & cFlagGenerateLog & ",'0','','',.F.,''," _
& cFlagRecompile & "," & cNoTimestamps & " )" & cFlagRecompile & "," & cNoTimestamps & " )"
End If End If
If cFlagJustShowCall = "1" Then If cFlagJustShowCall = "1" Then
@@ -113,7 +113,7 @@ Else
Set oVFP9 = Nothing Set oVFP9 = Nothing
End If End If
WScript.Quit(nExitCode) WScript.Quit nExitCode
Function GetBit(lngValue, BitNum) Function GetBit(lngValue, BitNum)

307
foxbin2prg.prg
View File

@@ -415,7 +415,7 @@ LPARAMETERS tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDeb
+ " FOXBIN2PRG 'c:\desa\clases\*.vc2' '0' '0' '0' '1' '0'" + " FOXBIN2PRG 'c:\desa\clases\*.vc2' '0' '0' '0' '1' '0'"
#DEFINE C_FOXBIN2PRG_JUST_VFP_9_LOC "<22>FOXBIN2PRG es solo para Visual FoxPro 9.0!" #DEFINE C_FOXBIN2PRG_JUST_VFP_9_LOC "<22>FOXBIN2PRG es solo para Visual FoxPro 9.0!"
#DEFINE C_FOXBIN2PRG_WARN_CAPTION_LOC "FOXBIN2PRG: <20>ATENCI<43>N!" #DEFINE C_FOXBIN2PRG_WARN_CAPTION_LOC "FOXBIN2PRG: <20>ATENCI<43>N!"
#DEFINE C_MENU_NOT_IN_VFP9_FORMAT_LOC "El Men<65> [<<THIS.c_InputFile>>] NO est<73> en formato VFP 9! - Por favor convertirlo a VFP 9 con MODIFY MENU <<JUSTFNAME((THIS.c_InputFile))>>" #DEFINE C_MENU_NOT_IN_VFP9_FORMAT_LOC "El Men<65> [<<THIS.c_InputFile>>] NO est<73> en formato VFP 9! - Por favor convertirlo a VFP 9 con MODIFY MENU '<<THIS.c_InputFile>>'"
#DEFINE C_LANGUAGE_LOC "ES" #DEFINE C_LANGUAGE_LOC "ES"
#DEFINE C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC "* Se ha encontrado el programa de capitalizaci<63>n de nombres [<<lcEXE_CAPS>>]" #DEFINE C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC "* Se ha encontrado el programa de capitalizaci<63>n de nombres [<<lcEXE_CAPS>>]"
#DEFINE C_NAMES_CAPITALIZATION_PROGRAM_NOT_FOUND_LOC "* No se ha encontrado el programa de capitalizaci<63>n de nombres [<<lcEXE_CAPS>>]" #DEFINE C_NAMES_CAPITALIZATION_PROGRAM_NOT_FOUND_LOC "* No se ha encontrado el programa de capitalizaci<63>n de nombres [<<lcEXE_CAPS>>]"
@@ -427,6 +427,7 @@ LPARAMETERS tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDeb
#DEFINE C_PROCESSING_LOC "Procesando archivo" #DEFINE C_PROCESSING_LOC "Procesando archivo"
#DEFINE C_PROCESS_PROGRESS_LOC "Avance del proceso:" #DEFINE C_PROCESS_PROGRESS_LOC "Avance del proceso:"
#DEFINE C_PROPERTY_NAME_NOT_RECOGNIZED_LOC "Propiedad [<<TRANSFORM(tnPropertyID)>>] no reconocida." #DEFINE C_PROPERTY_NAME_NOT_RECOGNIZED_LOC "Propiedad [<<TRANSFORM(tnPropertyID)>>] no reconocida."
#DEFINE C_REPORT_NOT_IN_VFP9_FORMAT_LOC "El Reporte [<<THIS.c_InputFile>>] NO est<73> en formato VFP 9! - Por favor convertirlo a VFP 9 con MODIFY REPORT '<<THIS.c_InputFile>>'"
#DEFINE C_REQUESTING_CAPITALIZATION_OF_FILE_LOC "- Solicitado capitalizar el archivo [<<tcFileName>>]" #DEFINE C_REQUESTING_CAPITALIZATION_OF_FILE_LOC "- Solicitado capitalizar el archivo [<<tcFileName>>]"
#DEFINE C_SOURCEFILE_LOC "Archivo origen: " #DEFINE C_SOURCEFILE_LOC "Archivo origen: "
#DEFINE C_STRUCTURE_NESTING_ERROR_ENDPROC_EXPECTED_LOC "Error de anidamiento de estructuras. Se esperaba ENDPROC pero se encontr<74> ENDDEFINE en la clase <<toClase._Nombre>> (<<loProcedure._Nombre>>), l<>nea <<TRANSFORM(I)>> del archivo <<THIS.c_InputFile>>" #DEFINE C_STRUCTURE_NESTING_ERROR_ENDPROC_EXPECTED_LOC "Error de anidamiento de estructuras. Se esperaba ENDPROC pero se encontr<74> ENDDEFINE en la clase <<toClase._Nombre>> (<<loProcedure._Nombre>>), l<>nea <<TRANSFORM(I)>> del archivo <<THIS.c_InputFile>>"
@@ -451,7 +452,7 @@ loCnv = CREATEOBJECT("c_foxbin2prg")
loEx = NULL loEx = NULL
lnResp = loCnv.ejecutar( tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDebug ; lnResp = loCnv.ejecutar( tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDebug ;
, '', NULL, @loEx, .F., tcOriginalFileName, tcRecompile, tcNoTimestamps ) , tcDontShowProgress, NULL, @loEx, .F., tcOriginalFileName, tcRecompile, tcNoTimestamps )
ADDPROPERTY(_SCREEN, 'ExitCode', lnResp) ADDPROPERTY(_SCREEN, 'ExitCode', lnResp)
*IF _VFP.STARTMODE <= 1 *IF _VFP.STARTMODE <= 1
@@ -668,7 +669,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
SET SEPARATOR TO ',' SET SEPARATOR TO ','
ON ESCAPE ERROR 1799 ON ESCAPE ERROR 1799
SET ESCAPE ON SET ESCAPE ON
lcSys16 = SYS(16) lcSys16 = SYS(16)
IF LEFT(lcSys16,10) == 'PROCEDURE ' IF LEFT(lcSys16,10) == 'PROCEDURE '
@@ -699,11 +700,12 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
ERASE ( lcFileCDX ) ERASE ( lcFileCDX )
THIS.writeLog_Flush() THIS.writeLog_Flush()
THIS.descargar_frm_avance()
CATCH CATCH
FINALLY FINALLY
ON ESCAPE ON ESCAPE
THIS.o_Frm_Avance = NULL
THIS.o_FSO = NULL THIS.o_FSO = NULL
THIS.o_FNC = NULL THIS.o_FNC = NULL
ENDTRY ENDTRY
@@ -715,7 +717,9 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
PROCEDURE AvanceDelProceso PROCEDURE AvanceDelProceso
LPARAMETERS tcTexto, tnValor, tnTotal, tnTipo LPARAMETERS tcTexto, tnValor, tnTotal, tnTipo
IF THIS.l_ShowProgress AND PEMSTATUS(THIS, 'o_Frm_Avance', 5) THEN *IF THIS.l_ShowProgress AND VARTYPE(THIS.o_Frm_Avance) = "O" THEN
*-- Si o_Frm_Avance se habilit<69> de forma externa, l_ShowProgress podr<64>a ser .F. para controlarlo desde fuera.
IF VARTYPE(THIS.o_Frm_Avance) = "O" THEN
THIS.o_Frm_Avance.AvanceDelProceso( tcTexto, tnValor, tnTotal, tnTipo ) THIS.o_Frm_Avance.AvanceDelProceso( tcTexto, tnValor, tnTotal, tnTipo )
ENDIF ENDIF
ENDPROC ENDPROC
@@ -1183,17 +1187,17 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
tcOutputFile_Ext1 = FORCEEXT(tcOutputFile, lcExt_1) tcOutputFile_Ext1 = FORCEEXT(tcOutputFile, lcExt_1)
IF FILE( tcOutputFile_Ext1 ) IF FILE( tcOutputFile_Ext1 )
*-- LOG *-- LOG
DO CASE DO CASE
CASE EMPTY(lcExt_2) CASE EMPTY(lcExt_2)
.writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 ) .writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 )
CASE EMPTY(lcExt_3) CASE EMPTY(lcExt_3)
.writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 + '/' + lcExt_2 ) .writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 + '/' + lcExt_2 )
OTHERWISE OTHERWISE
.writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 + '/' + lcExt_2 + '/' + lcExt_3 ) .writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 + '/' + lcExt_2 + '/' + lcExt_3 )
ENDCASE ENDCASE
*-- COPIA BACKUP *-- COPIA BACKUP
COPY FILE ( tcOutputFile_Ext1 ) TO ( tcBakFile_1 ) COPY FILE ( tcOutputFile_Ext1 ) TO ( tcBakFile_1 )
IF NOT EMPTY(lcExt_2) IF NOT EMPTY(lcExt_2)
@@ -1201,7 +1205,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
IF FILE( tcOutputFile_Ext2 ) IF FILE( tcOutputFile_Ext2 )
COPY FILE ( tcOutputFile_Ext2 ) TO ( tcBakFile_2 ) COPY FILE ( tcOutputFile_Ext2 ) TO ( tcBakFile_2 )
ENDIF ENDIF
ENDIF ENDIF
IF NOT EMPTY(lcExt_3) IF NOT EMPTY(lcExt_3)
@@ -1209,11 +1213,11 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
IF FILE( tcOutputFile_Ext3 ) IF FILE( tcOutputFile_Ext3 )
COPY FILE ( tcOutputFile_Ext3 ) TO ( tcBakFile_3 ) COPY FILE ( tcOutputFile_Ext3 ) TO ( tcBakFile_3 )
ENDIF
ENDIF
ENDIF ENDIF
ENDIF ENDIF
ENDIF ENDIF
ENDIF
ENDIF
ENDWITH && THIS ENDWITH && THIS
CATCH TO toEx CATCH TO toEx
@@ -1236,8 +1240,19 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
PROCEDURE cargar_frm_avance PROCEDURE cargar_frm_avance
THIS.o_Frm_Avance = CREATEOBJECT("frm_avance") IF VARTYPE(THIS.o_Frm_Avance) <> "O" THEN
THIS.o_Frm_Avance.Show() THIS.o_Frm_Avance = CREATEOBJECT("frm_avance")
THIS.o_Frm_Avance.Show()
ENDIF
ENDPROC
PROCEDURE descargar_frm_avance
IF THIS.l_ShowProgress AND VARTYPE(THIS.o_Frm_Avance) = "O" THEN
THIS.o_Frm_Avance.Hide()
THIS.o_Frm_Avance.Release()
THIS.o_Frm_Avance = NULL
ENDIF
ENDPROC ENDPROC
@@ -1274,7 +1289,6 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
.l_CFG_CachedAccess = (.n_CFG_Actual > 0) .l_CFG_CachedAccess = (.n_CFG_Actual > 0)
ENDIF ENDIF
*IF NOT .l_ConfigEvaluated
lo_CFG = THIS lo_CFG = THIS
IF .n_CFG_Actual = 0 THEN IF .n_CFG_Actual = 0 THEN
@@ -1520,7 +1534,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
.writeLog( '> n_ExtraBackupLevels: ' + TRANSFORM(.n_ExtraBackupLevels) ) .writeLog( '> n_ExtraBackupLevels: ' + TRANSFORM(.n_ExtraBackupLevels) )
.writeLog( '> l_OptimizeByFilestamp: ' + TRANSFORM(.l_OptimizeByFilestamp) ) .writeLog( '> l_OptimizeByFilestamp: ' + TRANSFORM(.l_OptimizeByFilestamp) )
.writeLog( '> l_DropNullCharsFromCode: ' + TRANSFORM(.l_DropNullCharsFromCode) ) .writeLog( '> l_DropNullCharsFromCode: ' + TRANSFORM(.l_DropNullCharsFromCode) )
.writeLog( '> l_ClearDBFLastUpdate: ' + TRANSFORM(.l_ClearDBFLastUpdate) ) .writeLog( '> l_ClearDBFLastUpdate: ' + TRANSFORM(.l_ClearDBFLastUpdate) )
lo_CFG = NULL lo_CFG = NULL
RELEASE lo_CFG RELEASE lo_CFG
@@ -1573,7 +1587,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
* tcStrFileName2 (v! IN ) ***NO IMPLEMENTADO*** Contenido del archivo2 a comparar * tcStrFileName2 (v! IN ) ***NO IMPLEMENTADO*** Contenido del archivo2 a comparar
*--------------------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------------------
LPARAMETERS tcFilename1, tcFilename2, tcStrFileName2 LPARAMETERS tcFilename1, tcFilename2, tcStrFileName2
LOCAL lnComparacion, lnLen1, lnLen2, lnHandle1, lnHandle2, lnTipoComp, lnChunkSize ; LOCAL lnComparacion, lnLen1, lnLen2, lnHandle1, lnHandle2, lnTipoComp, lnChunkSize ;
, loEx as Exception , loEx as Exception
@@ -1605,30 +1619,30 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
lnComparacion = 0 && Son distintos lnComparacion = 0 && Son distintos
EXIT EXIT
ENDIF ENDIF
*-- Comparaci<63>n de contenido *-- Comparaci<63>n de contenido
FSEEK( lnHandle1, 0, 0 ) FSEEK( lnHandle1, 0, 0 )
FSEEK( lnHandle2, 0, 0 ) FSEEK( lnHandle2, 0, 0 )
DO WHILE NOT ( FEOF(lnHandle1) OR FEOF(lnHandle2) ) DO WHILE NOT ( FEOF(lnHandle1) OR FEOF(lnHandle2) )
IF NOT SYS( 2007, FREAD( lnHandle1, lnChunkSize ), -1, 1 ) == SYS( 2007, FREAD( lnHandle2, lnChunkSize ), -1, 1 ) THEN IF NOT SYS( 2007, FREAD( lnHandle1, lnChunkSize ), -1, 1 ) == SYS( 2007, FREAD( lnHandle2, lnChunkSize ), -1, 1 ) THEN
lnComparacion = 0 && Son distintos lnComparacion = 0 && Son distintos
EXIT EXIT
ENDIF ENDIF
ENDDO ENDDO
IF lnComparacion = 0 THEN IF lnComparacion = 0 THEN
EXIT EXIT
ENDIF ENDIF
lnComparacion = 1 && Son iguales lnComparacion = 1 && Son iguales
ENDCASE ENDCASE
CATCH TO loEx CATCH TO loEx
lnComparacion = -1 && Error lnComparacion = -1 && Error
THROW THROW
FINALLY FINALLY
DO CASE DO CASE
CASE lnTipoComp = 1 CASE lnTipoComp = 1
@@ -1638,7 +1652,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
ENDCASE ENDCASE
ENDTRY ENDTRY
RETURN lnComparacion RETURN lnComparacion
ENDFUNC ENDFUNC
@@ -2069,7 +2083,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
*-- Escribo la informaci<63>n de error en el archivo log de errores *-- Escribo la informaci<63>n de error en el archivo log de errores
TRY TRY
STRTOFILE( lcErrorInfo, EVL(tc_InputFile,'foxbin2prg') + '.ERR' ) STRTOFILE( STRCONV(lcErrorInfo,9), EVL(tc_InputFile,'foxbin2prg') + '.ERR' )
CATCH TO loEx2 CATCH TO loEx2
ENDTRY ENDTRY
@@ -2089,11 +2103,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
FINALLY FINALLY
USE IN (SELECT("TABLABIN")) USE IN (SELECT("TABLABIN"))
THIS.writeLog_Flush() THIS.writeLog_Flush()
IF THIS.l_ShowProgress AND VARTYPE(THIS.o_Frm_Avance) = "O" *THIS.descargar_frm_avance()
THIS.o_Frm_Avance.HIDE()
THIS.o_Frm_Avance.RELEASE()
STORE NULL TO THIS.o_Frm_Avance
ENDIF
CD (JUSTPATH(THIS.c_CurDir)) CD (JUSTPATH(THIS.c_CurDir))
STORE NULL TO loFSO STORE NULL TO loFSO
RELEASE tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDebug, tcDontShowProgress ; RELEASE tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDebug, tcDontShowProgress ;
@@ -2372,7 +2382,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
.o_Conversor.c_OriginalFileName = .c_OriginalFileName .o_Conversor.c_OriginalFileName = .c_OriginalFileName
.o_Conversor.c_Foxbin2prg_FullPath = .c_Foxbin2prg_FullPath .o_Conversor.c_Foxbin2prg_FullPath = .c_Foxbin2prg_FullPath
*-- *--
.AvanceDelProceso( C_PROCESSING_LOC + ' ' + .c_InputFile + '...', 1, 1, 0 ) .AvanceDelProceso( C_PROCESSING_LOC + ' ' + .c_InputFile + '...', 0, 0, 0 )
BINDEVENT( .o_Conversor, 'AvanceDelProceso', THIS, 'AvanceDelProceso' ) BINDEVENT( .o_Conversor, 'AvanceDelProceso', THIS, 'AvanceDelProceso' )
.o_Conversor.Convertir( @toModulo, .F., THIS ) .o_Conversor.Convertir( @toModulo, .F., THIS )
@@ -2538,41 +2548,41 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
ENDCASE ENDCASE
*-- Normalizar archivo(s) de entrada. El primero siempre se normaliza (??2, ??X, DBF, DBC) *-- Normalizar archivo(s) de entrada. El primero siempre se normaliza (??2, ??X, DBF, DBC)
.RenameFile( tcFileName, lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( tcFileName, lcEXE_CAPS, loFSO, llRelanzarError )
DO CASE DO CASE
CASE lcType = 'PJX' CASE lcType = 'PJX'
.RenameFile( FORCEEXT(tcFileName,'PJT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'PJT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'VCX' CASE lcType = 'VCX'
.RenameFile( FORCEEXT(tcFileName,'VCT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'VCT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'SCX' CASE lcType = 'SCX'
.RenameFile( FORCEEXT(tcFileName,'SCT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'SCT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'FRX' CASE lcType = 'FRX'
.RenameFile( FORCEEXT(tcFileName,'FRT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'FRT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'LBX' CASE lcType = 'LBX'
.RenameFile( FORCEEXT(tcFileName,'LBT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'LBT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'DBF' CASE lcType = 'DBF'
IF FILE( FORCEEXT(tcFileName,'FPT') ) IF FILE( FORCEEXT(tcFileName,'FPT') )
.RenameFile( FORCEEXT(tcFileName,'FPT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'FPT'), lcEXE_CAPS, loFSO, llRelanzarError )
ENDIF ENDIF
IF FILE( FORCEEXT(tcFileName,'CDX') ) IF FILE( FORCEEXT(tcFileName,'CDX') )
.RenameFile( FORCEEXT(tcFileName,'CDX'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'CDX'), lcEXE_CAPS, loFSO, llRelanzarError )
ENDIF ENDIF
CASE lcType = 'DBC' CASE lcType = 'DBC'
.RenameFile( FORCEEXT(tcFileName,'DCX'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'DCX'), lcEXE_CAPS, loFSO, llRelanzarError )
.RenameFile( FORCEEXT(tcFileName,'DCT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'DCT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'MNX' CASE lcType = 'MNX'
.RenameFile( FORCEEXT(tcFileName,'MNT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'MNT'), lcEXE_CAPS, loFSO, llRelanzarError )
ENDCASE ENDCASE
ENDWITH && THIS ENDWITH && THIS
@@ -2608,7 +2618,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
LPARAMETERS tcFileName LPARAMETERS tcFileName
LOCAL lcTmpFile, loFSO AS Scripting.FileSystemObject, loEx as Exception LOCAL lcTmpFile, loFSO AS Scripting.FileSystemObject, loEx as Exception
TRY TRY
*loFSO = THIS.o_FSO *loFSO = THIS.o_FSO
lcTmpFile = tcFileName + '.TMP' lcTmpFile = tcFileName + '.TMP'
@@ -2659,7 +2669,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
******************************************************************************************************************* *******************************************************************************************************************
PROCEDURE writeLog_Flush PROCEDURE writeLog_Flush
IF THIS.l_Debug AND NOT EMPTY(THIS.c_TextLog) IF THIS.l_Debug AND NOT EMPTY(THIS.c_TextLog)
STRTOFILE( THIS.c_TextLog + CR_LF, THIS.c_LogFile, 1 ) STRTOFILE( STRCONV(THIS.c_TextLog + CR_LF,9), THIS.c_LogFile, 1 )
THIS.c_TextLog = '' THIS.c_TextLog = ''
ENDIF ENDIF
ENDPROC ENDPROC
@@ -2702,7 +2712,7 @@ DEFINE CLASS frm_avance AS FORM
DoCreate = .T. DoCreate = .T.
AutoCenter = .T. AutoCenter = .T.
BorderStyle = 2 BorderStyle = 2
CAPTION = C_PROCESS_PROGRESS_LOC + ' ' CAPTION = C_PROCESS_PROGRESS_LOC + ' (Press Esc to Cancel)'
ControlBox = .F. ControlBox = .F.
BackColor = RGB(255,255,255) BackColor = RGB(255,255,255)
nmax_value = 100 nmax_value = 100
@@ -2785,23 +2795,38 @@ DEFINE CLASS frm_avance AS FORM
PROCEDURE AvanceDelProceso PROCEDURE AvanceDelProceso
LPARAMETERS tcTexto, tnValor, tnTotal, tnTipo LPARAMETERS tcTexto, tnValor, tnTotal, tnTipo
WITH THIS AS frm_avance OF foxbin2prg.prg WITH THIS AS frm_avance OF foxbin2prg.prg
DO CASE DO CASE
CASE tnTipo = 0 CASE tnTipo = 0
.lbl_tarea.Caption = tcTexto IF NOT EMPTY(tcTexto) THEN
.nMax_Value = tnTotal .lbl_tarea.Caption = tcTexto
.nValue = tnValor ENDIF
IF tnTotal > 0 THEN
.nmax_value = tnTotal
.nvalue = tnValor
ENDIF
CASE tnTipo = 1 CASE tnTipo = 1
.lbl_tarea2.Caption = tcTexto IF NOT EMPTY(tcTexto) THEN
.nMax_Value2 = tnTotal .lbl_tarea2.Caption = tcTexto
.nValue2 = tnValor ENDIF
IF tnTotal > 0 THEN
.nmax_value2 = tnTotal
.nvalue2 = tnValor
ENDIF
CASE tnTipo = 2 CASE tnTipo = 2
.lbl_tarea2.Caption = tcTexto IF NOT EMPTY(tcTexto) THEN
.nMax_Value2 = tnTotal .lbl_tarea2.Caption = tcTexto
.nValue2 = tnValor ENDIF
IF tnTotal > 0 THEN
.nmax_value2 = tnTotal
.nvalue2 = tnValor
ENDIF
ENDCASE ENDCASE
ENDWITH && THIS ENDWITH && THIS
@@ -2814,15 +2839,15 @@ DEFINE CLASS frm_avance AS FORM
LPARAMETERS vNewVal LPARAMETERS vNewVal
WITH THIS WITH THIS
.nValue = m.vNewVal .nvalue = m.vNewVal
.shp_avance.WIDTH = m.vNewVal * .shp_base.WIDTH / .nMax_Value .shp_avance.WIDTH = m.vNewVal * .shp_base.WIDTH / .nmax_value
ENDWITH ENDWITH
ENDPROC ENDPROC
PROCEDURE Init PROCEDURE Init
THIS.nValue = 0 THIS.nvalue = 0
THIS.nValue2 = 0 THIS.nvalue2 = 0
ENDPROC ENDPROC
@@ -2830,8 +2855,8 @@ DEFINE CLASS frm_avance AS FORM
LPARAMETERS vNewVal LPARAMETERS vNewVal
WITH THIS WITH THIS
.nValue2 = m.vNewVal .nvalue2 = m.vNewVal
.shp_avance2.WIDTH = m.vNewVal * .shp_base2.WIDTH / .nMax_Value2 .shp_avance2.WIDTH = m.vNewVal * .shp_base2.WIDTH / .nmax_value2
ENDWITH ENDWITH
ENDPROC ENDPROC
@@ -2937,6 +2962,8 @@ DEFINE CLASS c_conversor_base AS SESSION
SET TABLEPROMPT OFF SET TABLEPROMPT OFF
SET BLOCKSIZE TO 0 SET BLOCKSIZE TO 0
SET EXACT ON SET EXACT ON
*ON ESCAPE ERROR 1799
SET ESCAPE ON
PUBLIC C_FB2PRG_CODE PUBLIC C_FB2PRG_CODE
C_FB2PRG_CODE = '' && Contendr<64> todo el c<>digo generado C_FB2PRG_CODE = '' && Contendr<64> todo el c<>digo generado
@@ -6448,7 +6475,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
llEXTERNAL_CLASS_Completed = .T. llEXTERNAL_CLASS_Completed = .T.
*CASE .analizarBloque_DEFINE_CLASS( @toModulo, @loClase, @lcLine, @taCodeLines, @I, tnCodeLines ; *CASE .analizarBloque_DEFINE_CLASS( @toModulo, @loClase, @lcLine, @taCodeLines, @I, tnCodeLines ;
, @lcProcedureAbierto, @taLineasExclusion, @tnBloquesExclusion, @lc_Comentario ) , @lcProcedureAbierto, @taLineasExclusion, @tnBloquesExclusion, @lc_Comentario )
*-- Puede haber varias clases definidas *-- Puede haber varias clases definidas
* llEXTERNAL_CLASS_Completed = .T. * llEXTERNAL_CLASS_Completed = .T.
@@ -9173,12 +9200,12 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
PROCEDURE Classify_PAM_Hidden_Protected PROCEDURE Classify_PAM_Hidden_Protected
*--------------------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------------------
* PAR<41>METROS: (v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT) * PAR<41>METROS: (v=Pasar por valor | @=Pasar por referencia) (!=Obligatorio | ?=Opcional) (IN/OUT)
* tnPropsAndValues_Count (@! IN ) * tnPropsAndValues_Count (@! IN )
* taPropsAndValues (@! IN ) * taPropsAndValues (@! IN )
* tnProtected_Count (@! IN ) * tnProtected_Count (@! IN )
* taProtected (@! IN ) * taProtected (@! IN )
* tnPropsAndComments_Count (@! IN ) * tnPropsAndComments_Count (@! IN )
* taPropsAndComments (@! IN ) * taPropsAndComments (@! IN )
* tcHiddenProp (@! OUT) Lista de propiedades Hidden * tcHiddenProp (@! OUT) Lista de propiedades Hidden
* tcProtectedProp (@! OUT) Lista de propiedades Protected * tcProtectedProp (@! OUT) Lista de propiedades Protected
*--------------------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------------------
@@ -9196,7 +9223,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
DO CASE DO CASE
CASE EMPTY( taProtected(I) ) CASE EMPTY( taProtected(I) )
LOOP LOOP
CASE RIGHT( taProtected(I), 1 ) == '^' CASE RIGHT( taProtected(I), 1 ) == '^'
*-- Hidden Property or method *-- Hidden Property or method
lcProp = CHRTRAN( taProtected(I), '^', '' ) lcProp = CHRTRAN( taProtected(I), '^', '' )
@@ -9369,7 +9396,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
WHERE TABLABIN.PLATFORM = "COMMENT" AND TABLABIN.RESERVED2 == "OLEPublic" ; WHERE TABLABIN.PLATFORM = "COMMENT" AND TABLABIN.RESERVED2 == "OLEPublic" ;
ORDER BY 1 ; ORDER BY 1 ;
INTO ARRAY ta_NombresObjsOle INTO ARRAY ta_NombresObjsOle
FOR I = 1 TO _TALLY FOR I = 1 TO _TALLY
ta_NombresObjsOle(I) = ALLTRIM( ta_NombresObjsOle(I) ) ta_NombresObjsOle(I) = ALLTRIM( ta_NombresObjsOle(I) )
ENDFOR ENDFOR
@@ -10215,12 +10242,12 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
IF tnPropsAndComments_Count > 0 THEN IF tnPropsAndComments_Count > 0 THEN
lnComment = ASCAN( taPropsAndComments, taPropsAndValues(I,1), 1, 0, 1, 1+2+4+8) lnComment = ASCAN( taPropsAndComments, taPropsAndValues(I,1), 1, 0, 1, 1+2+4+8)
IF lnComment > 0 AND NOT EMPTY(taPropsAndComments(lnComment,2)) IF lnComment > 0 AND NOT EMPTY(taPropsAndComments(lnComment,2))
*TEXT TO tcCodigo ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2 *TEXT TO tcCodigo ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2
* <<>> && <<taPropsAndComments(lnComment,2)>> * <<>> && <<taPropsAndComments(lnComment,2)>>
*ENDTEXT *ENDTEXT
tcCodigo = tcCodigo + CHR(9) + CHR(9) + '&' + '& ' + taPropsAndComments(lnComment,2) tcCodigo = tcCodigo + CHR(9) + CHR(9) + '&' + '& ' + taPropsAndComments(lnComment,2)
ENDIF ENDIF
ENDIF ENDIF
ENDFOR ENDFOR
@@ -10906,7 +10933,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
*-- COMO CONSECUENCIA, LOS FORMS O CLASES CON OBJETOS OLE DAR<41>N DIFERENCIA POR <20>NICA VEZ EN LA CABECERA. - fdbozzo. 29/11/2014 (v1.19.37) *-- COMO CONSECUENCIA, LOS FORMS O CLASES CON OBJETOS OLE DAR<41>N DIFERENCIA POR <20>NICA VEZ EN LA CABECERA. - fdbozzo. 29/11/2014 (v1.19.37)
* *
*SELECT COUNT(*) FROM TABLABIN WHERE TABLABIN.PLATFORM = "WINDOWS" AND BASECLASS == 'olecontrol' INTO ARRAY laOLE *SELECT COUNT(*) FROM TABLABIN WHERE TABLABIN.PLATFORM = "WINDOWS" AND BASECLASS == 'olecontrol' INTO ARRAY laOLE
*IF laOLE(1) > 0 THEN *IF laOLE(1) > 0 THEN
* *-- Lo del <<>> para crear una l<>nea vac<61>a es solamente por compatibilidad con lo antiguo, * *-- Lo del <<>> para crear una l<>nea vac<61>a es solamente por compatibilidad con lo antiguo,
* *-- donde se creaba esta l<>nea cuando el form o clase ten<65>a al menos un objeto OLE. * *-- donde se creaba esta l<>nea cuando el form o clase ten<65>a al menos un objeto OLE.
@@ -10916,9 +10943,9 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
* ENDTEXT * ENDTEXT
*ELSE *ELSE
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
* *
ENDTEXT ENDTEXT
*ENDIF *ENDIF
*!* CATCH TO loEx *!* CATCH TO loEx
@@ -11064,9 +11091,9 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
LOCAL lnCodError, loRegClass, loRegObj, lnMethodCount, laMethods(1), laCode(1), laProtected(1), lnLen, lnObjCount ; LOCAL lnCodError, loRegClass, loRegObj, lnMethodCount, laMethods(1), laCode(1), laProtected(1), lnLen, lnObjCount ;
, laPropsAndValues(1), laPropsAndComments(1), lnLastClass, lnRecno, lcMethods, lcObjName, la_NombresObjsOle(1) ; , laPropsAndValues(1), laPropsAndComments(1), lnLastClass, lnRecno, lcMethods, lcObjName, la_NombresObjsOle(1) ;
, laObjs(1,3), I, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count, lcCodigo, laClasses(1,2) ; , laObjs(1,3), I, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count, lcCodigo, laClasses(1,2) ;
, lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal , lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal, lnStepCount, lnStep
STORE 0 TO lnCodError, lnLastClass, lnObjCount, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count ; STORE 0 TO lnCodError, lnLastClass, lnObjCount, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count ;
, lnMethodCount, lnClassCount , lnMethodCount, lnClassCount, lnStepCount, lnStep
STORE '' TO laMethods, laCode, laProtected, laPropsAndComments, laObjs, lcCodigo, laClasses, lcOutputFile ; STORE '' TO laMethods, laCode, laProtected, laPropsAndComments, laObjs, lcCodigo, laClasses, lcOutputFile ;
, C_FB2PRG_CODE, lcExternalHeader , C_FB2PRG_CODE, lcExternalHeader
STORE NULL TO loRegClass, loRegObj STORE NULL TO loRegClass, loRegObj
@@ -11075,6 +11102,7 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
USE (.c_InputFile) SHARED AGAIN NOUPDATE ALIAS _TABLAORIG USE (.c_InputFile) SHARED AGAIN NOUPDATE ALIAS _TABLAORIG
SELECT * FROM _TABLAORIG INTO CURSOR TABLABIN SELECT * FROM _TABLAORIG INTO CURSOR TABLABIN
.n_Avance_Maximo = _TALLY .n_Avance_Maximo = _TALLY
lnStepCount = 7
USE IN (SELECT("_TABLAORIG")) USE IN (SELECT("_TABLAORIG"))
INDEX ON PADR(LOWER(PLATFORM + IIF(EMPTY(PARENT),'',ALLTRIM(PARENT)+'.')+OBJNAME),240) TAG PARENT_OBJ OF TABLABIN ADDITIVE INDEX ON PADR(LOWER(PLATFORM + IIF(EMPTY(PARENT),'',ALLTRIM(PARENT)+'.')+OBJNAME),240) TAG PARENT_OBJ OF TABLABIN ADDITIVE
@@ -11131,7 +11159,9 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
lcObjName = ALLTRIM( loRegClass.OBJNAME ) lcObjName = ALLTRIM( loRegClass.OBJNAME )
laClasses(lnClassCount,1) = LOWER( lcObjName ) laClasses(lnClassCount,1) = LOWER( lcObjName )
.AvanceDelProceso( 'Processing Class ' + lcObjName + '...', lnClassCount, lnClassTotal, 1 )
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + '...', lnStep, lnClassTotal*lnStepCount, 1 )
.write_DEFINE_CLASS( @la_NombresObjsOle, @loRegClass, @lcCodigo ) .write_DEFINE_CLASS( @la_NombresObjsOle, @loRegClass, @lcCodigo )
@@ -11192,17 +11222,26 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
.write_INCLUDE( @loRegClass, @lcCodigo ) .write_INCLUDE( @loRegClass, @lcCodigo )
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + ' > Writing Properties...', lnStep, lnClassTotal*lnStepCount, 1 )
.write_CLASS_PROPERTIES( @loRegClass, @laPropsAndValues, @laPropsAndComments, @laProtected ; .write_CLASS_PROPERTIES( @loRegClass, @laPropsAndValues, @laPropsAndComments, @laProtected ;
, @lnPropsAndValues_Count, @lnPropsAndComments_Count, @lnProtected_Count, @lcCodigo ) , @lnPropsAndValues_Count, @lnPropsAndComments_Count, @lnProtected_Count, @lcCodigo )
ASORT(laObjs, 3, -1, 0, 0) && Orden Alfab<61>tico (del SCAN original) ASORT(laObjs, 3, -1, 0, 0) && Orden Alfab<61>tico (del SCAN original)
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + ' > Writing Obtects with Properties...', lnStep, lnClassTotal*lnStepCount, 1 )
FOR I = 1 TO lnObjCount FOR I = 1 TO lnObjCount
.write_ADD_OBJECTS_WithProperties( laObjs(I,1), @lcCodigo ) .write_ADD_OBJECTS_WithProperties( laObjs(I,1), @lcCodigo )
ENDFOR ENDFOR
*-- OBTENGO LOS M<>TODOS DE LA CLASE PARA POSTERIOR TRATAMIENTO *-- OBTENGO LOS M<>TODOS DE LA CLASE PARA POSTERIOR TRATAMIENTO
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + ' > Getting Methods...', lnStep, lnClassTotal*lnStepCount, 1 )
DIMENSION laMethods(1,3), laCode(1) DIMENSION laMethods(1,3), laCode(1)
STORE '' TO laMethods, laCode STORE '' TO laMethods, laCode
lnMethodCount = 0 lnMethodCount = 0
@@ -11216,6 +11255,9 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
lcMethods = '' lcMethods = ''
*-- RECORRO LOS OBJETOS DENTRO DE LA CLASE ACTUAL PARA OBTENER SUS M<>TODOS *-- RECORRO LOS OBJETOS DENTRO DE LA CLASE ACTUAL PARA OBTENER SUS M<>TODOS
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + ' > Getting Objects Methods...', lnStep, lnClassTotal*lnStepCount, 1 )
lnRecno = RECNO() lnRecno = RECNO()
LOCATE FOR UPPER( TABLABIN.PLATFORM ) = "WINDOWS" AND LOWER( ALLTRIM( GETWORDNUM( TABLABIN.PARENT, 1, '.' ) ) ) == LOWER(lcObjName) LOCATE FOR UPPER( TABLABIN.PLATFORM ) = "WINDOWS" AND LOWER( ALLTRIM( GETWORDNUM( TABLABIN.PARENT, 1, '.' ) ) ) == LOWER(lcObjName)
@@ -11244,6 +11286,9 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg ) , @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg )
ENDSCAN ENDSCAN
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + ' > Writing Objects Methods...', lnStep, lnClassTotal*lnStepCount, 1 )
.write_ALL_OBJECT_METHODS( @lcMethods, @laMethods, @laCode, @lnMethodCount, @laPropsAndComments, lnPropsAndComments_Count, @laProtected ; .write_ALL_OBJECT_METHODS( @lcMethods, @laMethods, @laCode, @lnMethodCount, @laPropsAndComments, lnPropsAndComments_Count, @laProtected ;
, lnProtected_Count, @toFoxBin2Prg, @lcCodigo ) , lnProtected_Count, @toFoxBin2Prg, @lcCodigo )
@@ -11257,7 +11302,9 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
ENDIF ENDIF
*-- Genero el VC2 *-- Genero el VC2
.AvanceDelProceso( 'Writing VC2...', 2, 2, 1 ) lnStep = lnStep + 1
.AvanceDelProceso( 'Writing VC2...', lnStep, lnClassTotal*lnStepCount, 1 )
lcOutputFile = .c_OutputFile lcOutputFile = .c_OutputFile
lcCodigo = toFoxBin2Prg.get_PROGRAM_HEADER() + lcExternalHeader + C_FB2PRG_CODE lcCodigo = toFoxBin2Prg.get_PROGRAM_HEADER() + lcExternalHeader + C_FB2PRG_CODE
@@ -11281,7 +11328,7 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
ENDFOR ENDFOR
.write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg ) .write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg )
ENDIF ENDIF
ENDIF ENDIF
ENDWITH && THIS ENDWITH && THIS
@@ -11335,9 +11382,9 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
LOCAL lnCodError, loRegClass, loRegObj, lnMethodCount, laMethods(1), laCode(1), laProtected(1), lnLen, lnObjCount ; LOCAL lnCodError, loRegClass, loRegObj, lnMethodCount, laMethods(1), laCode(1), laProtected(1), lnLen, lnObjCount ;
, laPropsAndValues(1), laPropsAndComments(1), lnLastClass, lnRecno, lcMethods, lcObjName, la_NombresObjsOle(1) ; , laPropsAndValues(1), laPropsAndComments(1), lnLastClass, lnRecno, lcMethods, lcObjName, la_NombresObjsOle(1) ;
, laObjs(1,3), I, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count, lcCodigo, laClasses(1,2) ; , laObjs(1,3), I, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count, lcCodigo, laClasses(1,2) ;
, lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal , lnClassCount, lcOutputFile, lcExternalHeader, lnClassTotal, lnStepCount, lnStep
STORE 0 TO lnCodError, lnLastClass, lnObjCount, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count ; STORE 0 TO lnCodError, lnLastClass, lnObjCount, lnPropsAndValues_Count, lnPropsAndComments_Count, lnProtected_Count ;
, lnMethodCount, lnClassCount , lnMethodCount, lnClassCount, lnStepCount, lnStep
STORE '' TO laMethods, laCode, laProtected, laPropsAndComments, laObjs, lcCodigo, laClasses, lcOutputFile ; STORE '' TO laMethods, laCode, laProtected, laPropsAndComments, laObjs, lcCodigo, laClasses, lcOutputFile ;
, C_FB2PRG_CODE, lcExternalHeader , C_FB2PRG_CODE, lcExternalHeader
STORE NULL TO loRegClass, loRegObj STORE NULL TO loRegClass, loRegObj
@@ -11386,8 +11433,8 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
COUNT ALL FOR TABLABIN.PLATFORM = "WINDOWS" ; COUNT ALL FOR TABLABIN.PLATFORM = "WINDOWS" ;
AND ( EMPTY( TABLABIN.PARENT ) ; AND ( EMPTY( TABLABIN.PARENT ) ;
AND INLIST( LOWER( TABLABIN.BASECLASS ), 'dataenvironment', 'form', 'formset' ) ) TO lnClassTotal AND INLIST( LOWER( TABLABIN.BASECLASS ), 'dataenvironment', 'form', 'formset' ) ) TO lnClassTotal
SCAN ALL FOR TABLABIN.PLATFORM = "WINDOWS" ; SCAN ALL FOR TABLABIN.PLATFORM = "WINDOWS" ;
AND ( EMPTY( TABLABIN.PARENT ) ; AND ( EMPTY( TABLABIN.PARENT ) ;
@@ -11418,7 +11465,9 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
lcObjName = ALLTRIM(loRegClass.OBJNAME) lcObjName = ALLTRIM(loRegClass.OBJNAME)
laClasses(lnClassCount,1) = LOWER( lcObjName ) laClasses(lnClassCount,1) = LOWER( lcObjName )
.AvanceDelProceso( 'Processing Class ' + lcObjName + '...', lnClassCount, lnClassTotal, 1 )
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + '...', lnStep, lnClassTotal*lnStepCount, 1 )
.write_DEFINE_CLASS( @la_NombresObjsOle, @loRegClass, @lcCodigo ) .write_DEFINE_CLASS( @la_NombresObjsOle, @loRegClass, @lcCodigo )
@@ -11479,18 +11528,26 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
.write_INCLUDE( @loRegClass, @lcCodigo ) .write_INCLUDE( @loRegClass, @lcCodigo )
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + ' > Writing Properties...', lnStep, lnClassTotal*lnStepCount, 1 )
.write_CLASS_PROPERTIES( @loRegClass, @laPropsAndValues, @laPropsAndComments, @laProtected ; .write_CLASS_PROPERTIES( @loRegClass, @laPropsAndValues, @laPropsAndComments, @laProtected ;
, @lnPropsAndValues_Count, @lnPropsAndComments_Count, @lnProtected_Count, @lcCodigo ) , @lnPropsAndValues_Count, @lnPropsAndComments_Count, @lnProtected_Count, @lcCodigo )
ASORT(laObjs, 3, -1, 0, 0) && Orden Alfab<61>tico de objetos (del SCAN original) ASORT(laObjs, 3, -1, 0, 0) && Orden Alfab<61>tico de objetos (del SCAN original)
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + ' > Writing Obtects with Properties...', lnStep, lnClassTotal*lnStepCount, 1 )
FOR I = 1 TO lnObjCount FOR I = 1 TO lnObjCount
.write_ADD_OBJECTS_WithProperties( laObjs(I,1), @lcCodigo ) .write_ADD_OBJECTS_WithProperties( laObjs(I,1), @lcCodigo )
ENDFOR ENDFOR
*-- OBTENGO LOS M<>TODOS DE LA CLASE PARA POSTERIOR TRATAMIENTO *-- OBTENGO LOS M<>TODOS DE LA CLASE PARA POSTERIOR TRATAMIENTO
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + ' > Getting Methods...', lnStep, lnClassTotal*lnStepCount, 1 )
DIMENSION laMethods(1,3), laCode(1) DIMENSION laMethods(1,3), laCode(1)
STORE '' TO laMethods, laCode STORE '' TO laMethods, laCode
lnMethodCount = 0 lnMethodCount = 0
@@ -11504,6 +11561,9 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
lcMethods = '' lcMethods = ''
*-- RECORRO LOS OBJETOS DENTRO DE LA CLASE ACTUAL PARA OBTENER SUS M<>TODOS *-- RECORRO LOS OBJETOS DENTRO DE LA CLASE ACTUAL PARA OBTENER SUS M<>TODOS
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + ' > Getting Objects Methods...', lnStep, lnClassTotal*lnStepCount, 1 )
lnRecno = RECNO() lnRecno = RECNO()
LOCATE FOR TABLABIN.PLATFORM = "WINDOWS" AND LOWER( ALLTRIM( GETWORDNUM( TABLABIN.PARENT, 1, '.' ) ) ) == LOWER(lcObjName) LOCATE FOR TABLABIN.PLATFORM = "WINDOWS" AND LOWER( ALLTRIM( GETWORDNUM( TABLABIN.PARENT, 1, '.' ) ) ) == LOWER(lcObjName)
@@ -11534,6 +11594,9 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
, @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg ) , @laPropsAndComments, lnPropsAndComments_Count, @laProtected, lnProtected_Count, @toFoxBin2Prg )
ENDSCAN ENDSCAN
lnStep = lnStep + 1
.AvanceDelProceso( 'Processing Class ' + lcObjName + ' > Writing Objects Methods...', lnStep, lnClassTotal*lnStepCount, 1 )
.write_ALL_OBJECT_METHODS( @lcMethods, @laMethods, @laCode, @lnMethodCount, @laPropsAndComments, lnPropsAndComments_Count, @laProtected ; .write_ALL_OBJECT_METHODS( @lcMethods, @laMethods, @laCode, @lnMethodCount, @laPropsAndComments, lnPropsAndComments_Count, @laProtected ;
, lnProtected_Count, @toFoxBin2Prg, @lcCodigo ) , lnProtected_Count, @toFoxBin2Prg, @lcCodigo )
@@ -11547,7 +11610,9 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
ENDIF ENDIF
*-- Genero el SC2 *-- Genero el SC2
.AvanceDelProceso( 'Writing SC2...', 2, 2, 1 ) lnStep = lnStep + 1
.AvanceDelProceso( 'Writing SC2...', lnStep, lnClassTotal*lnStepCount, 1 )
lcOutputFile = .c_OutputFile lcOutputFile = .c_OutputFile
lcCodigo = toFoxBin2Prg.get_PROGRAM_HEADER() + lcExternalHeader + C_FB2PRG_CODE lcCodigo = toFoxBin2Prg.get_PROGRAM_HEADER() + lcExternalHeader + C_FB2PRG_CODE
@@ -11571,7 +11636,7 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
ENDFOR ENDFOR
.write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg ) .write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg )
ENDIF ENDIF
ENDIF ENDIF
ENDWITH && THIS ENDWITH && THIS
@@ -12349,10 +12414,17 @@ DEFINE CLASS c_conversor_frx_a_prg AS c_conversor_bin_a_prg
WITH THIS AS c_conversor_pjm_a_prg OF 'FOXBIN2PRG.PRG' WITH THIS AS c_conversor_pjm_a_prg OF 'FOXBIN2PRG.PRG'
USE (.c_InputFile) SHARED AGAIN NOUPDATE ALIAS _TABLAORIG USE (.c_InputFile) SHARED AGAIN NOUPDATE ALIAS _TABLAORIG
THIS.AvanceDelProceso( 'Scanning FRX...', 1, 2, 1 )
*-- Verificaci<63>n de REPORTE VFP 9
IF FCOUNT() < 75 OR EMPTY(FIELD("USER"))
*ERROR 'Report [' + (.c_InputFile) + '] is NOT VFP 9 Format! - Please convert to VFP 9 with MODIFY REPORT ' + JUSTFNAME((.c_InputFile))
ERROR (TEXTMERGE(C_REPORT_NOT_IN_VFP9_FORMAT_LOC))
ENDIF
SELECT * FROM _TABLAORIG INTO CURSOR TABLABIN_0 SELECT * FROM _TABLAORIG INTO CURSOR TABLABIN_0
.n_Avance_Maximo = _TALLY .n_Avance_Maximo = _TALLY
USE IN (SELECT("_TABLAORIG")) USE IN (SELECT("_TABLAORIG"))
THIS.AvanceDelProceso( 'Scanning FRX...', 1, 2, 1 )
*-- Header *-- Header
LOCATE FOR ObjType = 1 LOCATE FOR ObjType = 1
@@ -12509,7 +12581,7 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
WITH THIS AS c_conversor_dbf_a_prg OF 'FOXBIN2PRG.PRG' WITH THIS AS c_conversor_dbf_a_prg OF 'FOXBIN2PRG.PRG'
*-- EVALUAR OPCIONES ESPEC<45>FICAS DE DBF *-- EVALUAR OPCIONES ESPEC<45>FICAS DE DBF
.AvanceDelProceso( 'Scanning DBF Structure...', 1, 2, 1 ) .AvanceDelProceso( 'Scanning DBF Structure...', 1, 3, 1 )
*-- Include *-- Include
IF NOT EMPTY(toFoxBin2Prg.DBF_Conversion_Included) AND NOT toFoxBin2Prg.DBF_Conversion_Included == '*' ; IF NOT EMPTY(toFoxBin2Prg.DBF_Conversion_Included) AND NOT toFoxBin2Prg.DBF_Conversion_Included == '*' ;
@@ -12536,23 +12608,23 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
*-- Header *-- Header
loTable = CREATEOBJECT('CL_DBF_TABLE') loTable = CREATEOBJECT('CL_DBF_TABLE')
IF toFoxBin2Prg.DBF_Conversion_Support = 4 IF toFoxBin2Prg.DBF_Conversion_Support = 4
*-- Exportaci<63>n de estructura y datos (para Diff solamente) *-- Exportaci<63>n de estructura y datos (para Diff solamente)
ERASE (.c_OutputFile + '.TMP' ) ERASE (.c_OutputFile + '.TMP' )
toFoxBin2Prg.n_FileHandle = FCREATE( .c_OutputFile + '.TMP' ) toFoxBin2Prg.n_FileHandle = FCREATE( .c_OutputFile + '.TMP' )
IF toFoxBin2Prg.n_FileHandle = -1 THEN IF toFoxBin2Prg.n_FileHandle = -1 THEN
ERROR 102, (.c_OutputFile) ERROR 102, (.c_OutputFile)
ENDIF ENDIF
FWRITE( toFoxBin2Prg.n_FileHandle, C_FB2PRG_CODE ) FWRITE( toFoxBin2Prg.n_FileHandle, C_FB2PRG_CODE )
loTable.toText( ln_HexFileType, ll_FileHasCDX, ll_FileHasMemo, ll_FileIsDBC, lc_DBC_Name, .c_InputFile, lc_FileTypeDesc, @toFoxBin2Prg ) loTable.toText( ln_HexFileType, ll_FileHasCDX, ll_FileHasMemo, ll_FileIsDBC, lc_DBC_Name, .c_InputFile, lc_FileTypeDesc, @toFoxBin2Prg )
FCLOSE( toFoxBin2Prg.n_FileHandle ) FCLOSE( toFoxBin2Prg.n_FileHandle )
*-- Genero el DB2, renombrando el TMP *-- Genero el DB2, renombrando el TMP
.AvanceDelProceso( 'Writing DB2...', 2, 2, 1 ) .AvanceDelProceso( 'Writing DB2...', 3, 3, 1 )
IF .l_Test IF .l_Test
toModulo = C_FB2PRG_CODE toModulo = C_FB2PRG_CODE
ELSE ELSE
@@ -12574,7 +12646,7 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
*-- Genero el DB2 *-- Genero el DB2
.AvanceDelProceso( 'Writing DB2...', 2, 2, 1 ) .AvanceDelProceso( 'Writing DB2...', 3, 3, 1 )
IF .l_Test IF .l_Test
toModulo = C_FB2PRG_CODE toModulo = C_FB2PRG_CODE
ELSE ELSE
@@ -12745,7 +12817,7 @@ DEFINE CLASS c_conversor_mnx_a_prg AS c_conversor_bin_a_prg
SELECT * FROM _TABLAORIG INTO CURSOR TABLABIN SELECT * FROM _TABLAORIG INTO CURSOR TABLABIN
.n_Avance_Maximo = _TALLY .n_Avance_Maximo = _TALLY
USE IN (SELECT("_TABLAORIG")) USE IN (SELECT("_TABLAORIG"))
.AvanceDelProceso( 'Analyzing MNX...', 2, 2, 1 ) .AvanceDelProceso( 'Analyzing MNX...', 1, 2, 1 )
*-- Verificaci<63>n de men<65> VFP 9 *-- Verificaci<63>n de men<65> VFP 9
IF FCOUNT() < 25 OR EMPTY(FIELD("RESNAME")) OR EMPTY(FIELD("SYSRES")) IF FCOUNT() < 25 OR EMPTY(FIELD("RESNAME")) OR EMPTY(FIELD("SYSRES"))
@@ -18001,10 +18073,11 @@ DEFINE CLASS CL_DBF_RECORDS AS CL_COL_BASE
#ENDIF #ENDIF
TRY TRY
LOCAL lcText, loEx AS EXCEPTION, I ; LOCAL lcText, loEx AS EXCEPTION, I, lnReccount ;
, loRecord AS CL_DBF_RECORD OF 'FOXBIN2PRG.PRG' , loRecord AS CL_DBF_RECORD OF 'FOXBIN2PRG.PRG'
lcText = '' lcText = ''
I = 0 I = 0
lnReccount = RECCOUNT() && Realmente no es muy exacto, pero al menos muestra el avance.
TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
<<>> <<>>
@@ -18023,11 +18096,15 @@ DEFINE CLASS CL_DBF_RECORDS AS CL_COL_BASE
I = I + 1 I = I + 1
lcText = loRecord.toText(@taFields, tnField_Count) lcText = loRecord.toText(@taFields, tnField_Count)
FWRITE( toFoxBin2Prg.n_FileHandle, lcText ) FWRITE( toFoxBin2Prg.n_FileHandle, lcText )
IF MOD(I,10000) = 0 THEN IF MOD(I,1000) = 0 THEN
FFLUSH( toFoxBin2Prg.n_FileHandle, .T. ) toFoxBin2Prg.AvanceDelProceso( 'Exporting DBF Data...', 1+(I/lnReccount), 3, 2 )
IF MOD(I,10000) = 0 THEN
FFLUSH( toFoxBin2Prg.n_FileHandle, .T. )
ENDIF
ENDIF ENDIF
ENDSCAN ENDSCAN
lcText = '' lcText = ''
TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
@@ -20615,7 +20692,7 @@ DEFINE CLASS CL_DBF_UTILS AS SESSION
, loField AS CL_DBF_UTILS_FIELD OF 'FOXBIN2PRG.PRG' , loField AS CL_DBF_UTILS_FIELD OF 'FOXBIN2PRG.PRG'
STORE NULL TO loField STORE NULL TO loField
tn_HexFileType = 0 tn_HexFileType = 0
tcDBC_Name = '' STORE '' TO tcDBC_Name, lcStr
lnHandle = FOPEN(tc_FileName,0) lnHandle = FOPEN(tc_FileName,0)
IF lnHandle = -1 IF lnHandle = -1
@@ -20696,6 +20773,10 @@ DEFINE CLASS CL_DBF_UTILS AS SESSION
ENDWITH ENDWITH
CATCH TO loEx CATCH TO loEx
loEx.UserValue = loEx.UserValue + 'lcStr = [' + TRANSFORM(lcStr) + '] / LenStr = ' + TRANSFORM(LEN(TRANSFORM(lcStr))) + CR_LF
IF loEx.ErrorNo = 11 THEN &&
loEx.UserValue = loEx.UserValue + '> POSSIBLE CORRUPTED TABLE' + CR_LF
ENDIF
IF THIS.l_Debug AND _VFP.STARTMODE = 0 IF THIS.l_Debug AND _VFP.STARTMODE = 0
SET STEP ON SET STEP ON
ENDIF ENDIF

3
foxbin2prg_de.h
View File

@@ -31,7 +31,7 @@
#DEFINE C_FOXBIN2PRG_JUST_VFP_9_LOC "FOXBIN2PRG ist nur f<>r Visual FoxPro 9.0!" #DEFINE C_FOXBIN2PRG_JUST_VFP_9_LOC "FOXBIN2PRG ist nur f<>r Visual FoxPro 9.0!"
#DEFINE C_FOXBIN2PRG_WARN_CAPTION_LOC "FOXBIN2PRG: WARNUNG!" #DEFINE C_FOXBIN2PRG_WARN_CAPTION_LOC "FOXBIN2PRG: WARNUNG!"
#DEFINE C_LANGUAGE_LOC "DE" #DEFINE C_LANGUAGE_LOC "DE"
#DEFINE C_MENU_NOT_IN_VFP9_FORMAT_LOC "Menu [<<THIS.c_InputFile>>] ist NICHT in VFP 9 Format! - Bitte zuerst nach VFP 9 konvertieren mit MODIFY MENU <<JUSTFNAME((THIS.c_InputFile))>>" #DEFINE C_MENU_NOT_IN_VFP9_FORMAT_LOC "Menu [<<THIS.c_InputFile>>] ist NICHT in VFP 9 Format! - Bitte zuerst nach VFP 9 konvertieren mit MODIFY MENU '<<THIS.c_InputFile>>'"
#DEFINE C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC "* Programm f<>r Gro<72>schreibungssetzung [<<lcEXE_CAPS>>] gefunden" #DEFINE C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC "* Programm f<>r Gro<72>schreibungssetzung [<<lcEXE_CAPS>>] gefunden"
#DEFINE C_NAMES_CAPITALIZATION_PROGRAM_NOT_FOUND_LOC "* Programm f<>r Gro<72>schreibungssetzung [<<lcEXE_CAPS>>] nicht gefunden" #DEFINE C_NAMES_CAPITALIZATION_PROGRAM_NOT_FOUND_LOC "* Programm f<>r Gro<72>schreibungssetzung [<<lcEXE_CAPS>>] nicht gefunden"
#DEFINE C_OBJECT_NAME_WITHOUT_OBJECT_OREG_LOC "Objekt [<<toObj.CLASS>>] enth<74>lt nicht oReg Objekt (level <<TRANSFORM(tnNivel)>>)" #DEFINE C_OBJECT_NAME_WITHOUT_OBJECT_OREG_LOC "Objekt [<<toObj.CLASS>>] enth<74>lt nicht oReg Objekt (level <<TRANSFORM(tnNivel)>>)"
@@ -42,6 +42,7 @@
#DEFINE C_PROCESSING_LOC "Bearbeite Datei" #DEFINE C_PROCESSING_LOC "Bearbeite Datei"
#DEFINE C_PROCESS_PROGRESS_LOC "Bearbeitungsfortschritt:" #DEFINE C_PROCESS_PROGRESS_LOC "Bearbeitungsfortschritt:"
#DEFINE C_PROPERTY_NAME_NOT_RECOGNIZED_LOC "Eigenschaft [<<TRANSFORM(tnPropertyID)>>] nicht erkannt." #DEFINE C_PROPERTY_NAME_NOT_RECOGNIZED_LOC "Eigenschaft [<<TRANSFORM(tnPropertyID)>>] nicht erkannt."
#DEFINE 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>>'"
#DEFINE C_REQUESTING_CAPITALIZATION_OF_FILE_LOC "- Forder Gro<72>schreibung f<>r Datei [<<tcFileName>>] an" #DEFINE C_REQUESTING_CAPITALIZATION_OF_FILE_LOC "- Forder Gro<72>schreibung f<>r Datei [<<tcFileName>>] an"
#DEFINE C_SOURCEFILE_LOC "Source Datei: " #DEFINE C_SOURCEFILE_LOC "Source Datei: "
#DEFINE C_STRUCTURE_NESTING_ERROR_ENDPROC_EXPECTED_LOC "Fehler in Verschachtelungsstruktur. ENDPROC erwartet, aber es wurde ENDDEFINE in Klasse <<toClase._Nombre>> (<<loProcedure._Nombre>>), Zeile <<TRANSFORM(I)>> der Datei <<THIS.c_InputFile>> gefunden" #DEFINE C_STRUCTURE_NESTING_ERROR_ENDPROC_EXPECTED_LOC "Fehler in Verschachtelungsstruktur. ENDPROC erwartet, aber es wurde ENDDEFINE in Klasse <<toClase._Nombre>> (<<loProcedure._Nombre>>), Zeile <<TRANSFORM(I)>> der Datei <<THIS.c_InputFile>> gefunden"

3
foxbin2prg_en.h
View File

@@ -31,7 +31,7 @@
#DEFINE C_FOXBIN2PRG_JUST_VFP_9_LOC "FOXBIN2PRG is only for Visual FoxPro 9.0!" #DEFINE C_FOXBIN2PRG_JUST_VFP_9_LOC "FOXBIN2PRG is only for Visual FoxPro 9.0!"
#DEFINE C_FOXBIN2PRG_WARN_CAPTION_LOC "FOXBIN2PRG: WARNING!" #DEFINE C_FOXBIN2PRG_WARN_CAPTION_LOC "FOXBIN2PRG: WARNING!"
#DEFINE C_LANGUAGE_LOC "EN" #DEFINE C_LANGUAGE_LOC "EN"
#DEFINE C_MENU_NOT_IN_VFP9_FORMAT_LOC "Menu [<<THIS.c_InputFile>>] is NOT in VFP 9 Format! - Please convert to VFP 9 with MODIFY MENU <<JUSTFNAME((THIS.c_InputFile))>>" #DEFINE C_MENU_NOT_IN_VFP9_FORMAT_LOC "Menu [<<THIS.c_InputFile>>] is NOT in VFP 9 Format! - Please convert to VFP 9 with MODIFY MENU '<<THIS.c_InputFile>>'"
#DEFINE C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC "* Names capitalization program [<<lcEXE_CAPS>>] found" #DEFINE C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC "* Names capitalization program [<<lcEXE_CAPS>>] found"
#DEFINE C_NAMES_CAPITALIZATION_PROGRAM_NOT_FOUND_LOC "* Names capitalization program [<<lcEXE_CAPS>>] not found" #DEFINE C_NAMES_CAPITALIZATION_PROGRAM_NOT_FOUND_LOC "* Names capitalization program [<<lcEXE_CAPS>>] not found"
#DEFINE C_OBJECT_NAME_WITHOUT_OBJECT_OREG_LOC "Object [<<toObj.CLASS>>] does not contain oReg object (level <<TRANSFORM(tnNivel)>>)" #DEFINE C_OBJECT_NAME_WITHOUT_OBJECT_OREG_LOC "Object [<<toObj.CLASS>>] does not contain oReg object (level <<TRANSFORM(tnNivel)>>)"
@@ -42,6 +42,7 @@
#DEFINE C_PROCESSING_LOC "Processing file" #DEFINE C_PROCESSING_LOC "Processing file"
#DEFINE C_PROCESS_PROGRESS_LOC "Process Progress:" #DEFINE C_PROCESS_PROGRESS_LOC "Process Progress:"
#DEFINE C_PROPERTY_NAME_NOT_RECOGNIZED_LOC "Property [<<TRANSFORM(tnPropertyID)>>] is not recognized." #DEFINE C_PROPERTY_NAME_NOT_RECOGNIZED_LOC "Property [<<TRANSFORM(tnPropertyID)>>] is not recognized."
#DEFINE C_REPORT_NOT_IN_VFP9_FORMAT_LOC "Report [<<THIS.c_InputFile>>] is NOT in VFP 9 Format! - Please convert to VFP 9 with MODIFY REPORT '<<THIS.c_InputFile>>'"
#DEFINE C_REQUESTING_CAPITALIZATION_OF_FILE_LOC "- Requesting capitalization of file [<<tcFileName>>]" #DEFINE C_REQUESTING_CAPITALIZATION_OF_FILE_LOC "- Requesting capitalization of file [<<tcFileName>>]"
#DEFINE C_SOURCEFILE_LOC "Source file: " #DEFINE C_SOURCEFILE_LOC "Source file: "
#DEFINE C_STRUCTURE_NESTING_ERROR_ENDPROC_EXPECTED_LOC "Nesting structure error. ENDPROC expected but found ENDDEFINE on class <<toClase._Nombre>> (<<loProcedure._Nombre>>), line <<TRANSFORM(I)>> of file <<THIS.c_InputFile>>" #DEFINE C_STRUCTURE_NESTING_ERROR_ENDPROC_EXPECTED_LOC "Nesting structure error. ENDPROC expected but found ENDDEFINE on class <<toClase._Nombre>> (<<loProcedure._Nombre>>), line <<TRANSFORM(I)>> of file <<THIS.c_InputFile>>"