Changeset: 513 fdbozzo - 22/11/2014 19:42:46:
- Arreglo de línea vacía faltante en la cabecera OLE del inicio
This commit is contained in:
fdbozzo
105
foxbin2prg.prg
105
foxbin2prg.prg
@@ -1169,17 +1169,17 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
|
||||
tcOutputFile_Ext1 = FORCEEXT(tcOutputFile, lcExt_1)
|
||||
|
||||
IF FILE( tcOutputFile_Ext1 )
|
||||
*-- LOG
|
||||
DO CASE
|
||||
CASE EMPTY(lcExt_2)
|
||||
*-- LOG
|
||||
DO CASE
|
||||
CASE EMPTY(lcExt_2)
|
||||
.writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 )
|
||||
CASE EMPTY(lcExt_3)
|
||||
CASE EMPTY(lcExt_3)
|
||||
.writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 + '/' + lcExt_2 )
|
||||
OTHERWISE
|
||||
OTHERWISE
|
||||
.writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 + '/' + lcExt_2 + '/' + lcExt_3 )
|
||||
ENDCASE
|
||||
ENDCASE
|
||||
|
||||
*-- COPIA BACKUP
|
||||
*-- COPIA BACKUP
|
||||
COPY FILE ( tcOutputFile_Ext1 ) TO ( tcBakFile_1 )
|
||||
|
||||
IF NOT EMPTY(lcExt_2)
|
||||
@@ -1187,7 +1187,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
|
||||
|
||||
IF FILE( tcOutputFile_Ext2 )
|
||||
COPY FILE ( tcOutputFile_Ext2 ) TO ( tcBakFile_2 )
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
|
||||
IF NOT EMPTY(lcExt_3)
|
||||
@@ -1195,11 +1195,11 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
|
||||
|
||||
IF FILE( tcOutputFile_Ext3 )
|
||||
COPY FILE ( tcOutputFile_Ext3 ) TO ( tcBakFile_3 )
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDWITH && THIS
|
||||
|
||||
CATCH TO toEx
|
||||
@@ -2513,41 +2513,41 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
|
||||
|
||||
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 )
|
||||
|
||||
DO CASE
|
||||
CASE lcType = 'PJX'
|
||||
DO CASE
|
||||
CASE lcType = 'PJX'
|
||||
.RenameFile( FORCEEXT(tcFileName,'PJT'), lcEXE_CAPS, loFSO, llRelanzarError )
|
||||
|
||||
CASE lcType = 'VCX'
|
||||
CASE lcType = 'VCX'
|
||||
.RenameFile( FORCEEXT(tcFileName,'VCT'), lcEXE_CAPS, loFSO, llRelanzarError )
|
||||
|
||||
CASE lcType = 'SCX'
|
||||
CASE lcType = 'SCX'
|
||||
.RenameFile( FORCEEXT(tcFileName,'SCT'), lcEXE_CAPS, loFSO, llRelanzarError )
|
||||
|
||||
CASE lcType = 'FRX'
|
||||
CASE lcType = 'FRX'
|
||||
.RenameFile( FORCEEXT(tcFileName,'FRT'), lcEXE_CAPS, loFSO, llRelanzarError )
|
||||
|
||||
CASE lcType = 'LBX'
|
||||
CASE lcType = 'LBX'
|
||||
.RenameFile( FORCEEXT(tcFileName,'LBT'), lcEXE_CAPS, loFSO, llRelanzarError )
|
||||
|
||||
CASE lcType = 'DBF'
|
||||
CASE lcType = 'DBF'
|
||||
IF FILE( FORCEEXT(tcFileName,'FPT') )
|
||||
.RenameFile( FORCEEXT(tcFileName,'FPT'), lcEXE_CAPS, loFSO, llRelanzarError )
|
||||
ENDIF
|
||||
ENDIF
|
||||
IF FILE( FORCEEXT(tcFileName,'CDX') )
|
||||
.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,'DCT'), lcEXE_CAPS, loFSO, llRelanzarError )
|
||||
|
||||
CASE lcType = 'MNX'
|
||||
CASE lcType = 'MNX'
|
||||
.RenameFile( FORCEEXT(tcFileName,'MNT'), lcEXE_CAPS, loFSO, llRelanzarError )
|
||||
|
||||
ENDCASE
|
||||
ENDCASE
|
||||
|
||||
ENDWITH && THIS
|
||||
|
||||
@@ -6191,30 +6191,30 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
|
||||
CASE .lineaExcluida( I, tnBloquesExclusion, @taLineasExclusion ) ;
|
||||
OR .lineIsOnlyCommentAndNoMetadata( @lcLine, @lc_Comentario ) && Excluida, vac<61>a o solo Comentarios
|
||||
|
||||
*CASE NOT llFoxBin2Prg_Completed AND .analizarBloque_FoxBin2Prg( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines )
|
||||
* llFoxBin2Prg_Completed = .T.
|
||||
*CASE NOT llFoxBin2Prg_Completed AND .analizarBloque_FoxBin2Prg( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines )
|
||||
* llFoxBin2Prg_Completed = .T.
|
||||
|
||||
*CASE NOT llEXTERNAL_CLASS_Completed AND .analizarBloque_EXTERNAL_CLASS( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines )
|
||||
*CASE NOT llEXTERNAL_CLASS_Completed AND .analizarBloque_EXTERNAL_CLASS( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines )
|
||||
*-- Puede haber varias clases externas
|
||||
|
||||
*CASE NOT llLIBCOMMENT_Completed AND .analizarBloque_LIBCOMMENT( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines )
|
||||
* llLIBCOMMENT_Completed = .T.
|
||||
* llEXTERNAL_CLASS_Completed = .T.
|
||||
*CASE NOT llLIBCOMMENT_Completed AND .analizarBloque_LIBCOMMENT( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines )
|
||||
* llLIBCOMMENT_Completed = .T.
|
||||
* llEXTERNAL_CLASS_Completed = .T.
|
||||
|
||||
*CASE NOT llOLE_DEF_Completed AND .analizarBloque_OLE_DEF( @toModulo, @lcLine, @taCodeLines ;
|
||||
, @I, tnCodeLines, @lcProcedureAbierto )
|
||||
*CASE NOT llOLE_DEF_Completed AND .analizarBloque_OLE_DEF( @toModulo, @lcLine, @taCodeLines ;
|
||||
, @I, tnCodeLines, @lcProcedureAbierto )
|
||||
*-- Puede haber varios objetos OLE
|
||||
|
||||
*CASE NOT llINCLUDE_SCX_Completed AND .c_Type = 'SCX' AND .analizarBloque_INCLUDE( @toModulo, @loClase, @lcLine ;
|
||||
, @taCodeLines, @I, tnCodeLines, @lcProcedureAbierto )
|
||||
*CASE NOT llINCLUDE_SCX_Completed AND .c_Type = 'SCX' AND .analizarBloque_INCLUDE( @toModulo, @loClase, @lcLine ;
|
||||
, @taCodeLines, @I, tnCodeLines, @lcProcedureAbierto )
|
||||
* Espec<65>fico para SCX que lo tiene al inicio
|
||||
* llINCLUDE_SCX_Completed = .T.
|
||||
* llEXTERNAL_CLASS_Completed = .T.
|
||||
* llINCLUDE_SCX_Completed = .T.
|
||||
* llEXTERNAL_CLASS_Completed = .T.
|
||||
|
||||
CASE .analizarBloque_DEFINE_CLASS( @toModulo, @loClase, @lcLine, @taCodeLines, @I, tnCodeLines ;
|
||||
, @lcProcedureAbierto, @taLineasExclusion, @tnBloquesExclusion, @lc_Comentario )
|
||||
*-- Puede haber varias clases definidas
|
||||
* llEXTERNAL_CLASS_Completed = .T.
|
||||
* llEXTERNAL_CLASS_Completed = .T.
|
||||
|
||||
ENDCASE
|
||||
|
||||
@@ -6314,10 +6314,10 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
|
||||
llINCLUDE_SCX_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 )
|
||||
*-- Puede haber varias clases definidas
|
||||
* llEXTERNAL_CLASS_Completed = .T.
|
||||
* llEXTERNAL_CLASS_Completed = .T.
|
||||
|
||||
ENDCASE
|
||||
|
||||
@@ -6374,7 +6374,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
|
||||
*ERROR 'El conteo de clases externas (' + TRANSFORM(toModulo._ExternalClasses_Count) + ') no coincide con la cantidad encontrada (' + TRANSFORM(toModulo._Clases_Count) + ') en el archivo [' + toFoxBin2Prg.c_InputFile + ']'
|
||||
ERROR (TEXTMERGE(C_EXTERNAL_CLASS_COUNT_DOES_NOT_MATCH_FOUND_CLASSES))
|
||||
|
||||
*CASE toModulo._ExternalClasses_Count <> toModulo._Clases_Count THEN
|
||||
*CASE toModulo._ExternalClasses_Count <> toModulo._Clases_Count THEN
|
||||
ENDCASE
|
||||
|
||||
FOR I = 1 TO toModulo._ExternalClasses_Count
|
||||
@@ -8481,7 +8481,7 @@ DEFINE CLASS c_conversor_prg_a_dbf AS c_conversor_prg_a_bin
|
||||
IF toFoxBin2Prg.l_ClearDBFLastUpdate THEN
|
||||
ldLastUpdate = EVALUATE( '{^2013/11/04}' )
|
||||
ELSE
|
||||
ldLastUpdate = EVALUATE( '{^' + toTable._LastUpdate + '}' )
|
||||
ldLastUpdate = EVALUATE( '{^' + toTable._LastUpdate + '}' )
|
||||
ENDIF
|
||||
|
||||
loDBFUtils.write_DBC_BackLink( .c_OutputFile, toTable._Database, ldLastUpdate )
|
||||
@@ -10701,9 +10701,10 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
|
||||
|
||||
*!* ENDSCAN
|
||||
|
||||
TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
|
||||
*
|
||||
ENDTEXT
|
||||
TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
|
||||
<<>>
|
||||
*
|
||||
ENDTEXT
|
||||
|
||||
*!* CATCH TO loEx
|
||||
*!* IF THIS.l_Debug AND _VFP.STARTMODE = 0
|
||||
@@ -11044,7 +11045,7 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
|
||||
ENDFOR
|
||||
|
||||
.write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg )
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDWITH && THIS
|
||||
|
||||
@@ -11310,7 +11311,7 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
|
||||
ENDFOR
|
||||
|
||||
.write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg )
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDIF
|
||||
ENDWITH && THIS
|
||||
|
||||
@@ -12293,15 +12294,15 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
|
||||
ENDIF
|
||||
|
||||
ELSE
|
||||
C_FB2PRG_CODE = C_FB2PRG_CODE + loTable.toText( ln_HexFileType, ll_FileHasCDX, ll_FileHasMemo, ll_FileIsDBC, lc_DBC_Name, .c_InputFile, lc_FileTypeDesc, @toFoxBin2Prg )
|
||||
C_FB2PRG_CODE = C_FB2PRG_CODE + loTable.toText( ln_HexFileType, ll_FileHasCDX, ll_FileHasMemo, ll_FileIsDBC, lc_DBC_Name, .c_InputFile, lc_FileTypeDesc, @toFoxBin2Prg )
|
||||
|
||||
|
||||
*-- Genero el DB2
|
||||
IF .l_Test
|
||||
toModulo = C_FB2PRG_CODE
|
||||
ELSE
|
||||
.write_OutputFile( (C_FB2PRG_CODE), .c_OutputFile, @toFoxBin2Prg )
|
||||
ENDIF
|
||||
*-- Genero el DB2
|
||||
IF .l_Test
|
||||
toModulo = C_FB2PRG_CODE
|
||||
ELSE
|
||||
.write_OutputFile( (C_FB2PRG_CODE), .c_OutputFile, @toFoxBin2Prg )
|
||||
ENDIF
|
||||
|
||||
ENDIF
|
||||
|
||||
|
||||
Reference in New Issue
Block a user