Changeset: 509 fdbozzo - 21/11/2014 22:49:14:
This commit is contained in:
@@ -1505,6 +1505,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) )
|
||||||
|
|
||||||
lo_CFG = NULL
|
lo_CFG = NULL
|
||||||
RELEASE lo_CFG
|
RELEASE lo_CFG
|
||||||
@@ -1557,7 +1558,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
|
||||||
|
|
||||||
@@ -1589,30 +1590,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
|
||||||
@@ -1622,7 +1623,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
|
|||||||
ENDCASE
|
ENDCASE
|
||||||
|
|
||||||
ENDTRY
|
ENDTRY
|
||||||
|
|
||||||
RETURN lnComparacion
|
RETURN lnComparacion
|
||||||
ENDFUNC
|
ENDFUNC
|
||||||
|
|
||||||
@@ -2582,7 +2583,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'
|
||||||
@@ -8480,7 +8481,7 @@ DEFINE CLASS c_conversor_prg_a_dbf AS c_conversor_prg_a_bin
|
|||||||
IF toFoxBin2Prg.l_ClearDBFLastUpdate THEN
|
IF toFoxBin2Prg.l_ClearDBFLastUpdate THEN
|
||||||
ldLastUpdate = EVALUATE( '{^2013/11/04}' )
|
ldLastUpdate = EVALUATE( '{^2013/11/04}' )
|
||||||
ELSE
|
ELSE
|
||||||
ldLastUpdate = EVALUATE( '{^' + toTable._LastUpdate + '}' )
|
ldLastUpdate = EVALUATE( '{^' + toTable._LastUpdate + '}' )
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
loDBFUtils.write_DBC_BackLink( .c_OutputFile, toTable._Database, ldLastUpdate )
|
loDBFUtils.write_DBC_BackLink( .c_OutputFile, toTable._Database, ldLastUpdate )
|
||||||
@@ -12259,37 +12260,37 @@ 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
|
||||||
IF .l_Test
|
IF .l_Test
|
||||||
toModulo = C_FB2PRG_CODE
|
toModulo = C_FB2PRG_CODE
|
||||||
ELSE
|
ELSE
|
||||||
DO CASE
|
DO CASE
|
||||||
CASE FILE(.c_OutputFile) AND toFoxBin2Prg.FilesComparedAreEqual( .c_OutputFile + '.TMP', .c_OutputFile ) = 1
|
CASE FILE(.c_OutputFile) AND toFoxBin2Prg.FilesComparedAreEqual( .c_OutputFile + '.TMP', .c_OutputFile ) = 1
|
||||||
ERASE (.c_OutputFile + '.TMP')
|
ERASE (.c_OutputFile + '.TMP')
|
||||||
*.writeLog( 'El archivo de salida [' + .c_OutputFile + '] no se sobreescribe por ser igual al generado.' )
|
*.writeLog( 'El archivo de salida [' + .c_OutputFile + '] no se sobreescribe por ser igual al generado.' )
|
||||||
.writeLog( TEXTMERGE(C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC) )
|
.writeLog( TEXTMERGE(C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC) )
|
||||||
CASE toFoxBin2Prg.doBackup( .F., .T., '', '', '' ) ;
|
CASE toFoxBin2Prg.doBackup( .F., .T., '', '', '' ) ;
|
||||||
AND toFoxBin2Prg.ChangeFileAttribute( .c_OutputFile, '-R' ) ;
|
AND toFoxBin2Prg.ChangeFileAttribute( .c_OutputFile, '-R' ) ;
|
||||||
AND NOT toFoxBin2Prg.RenameTmpFile2Tx2File( .c_OutputFile )
|
AND NOT toFoxBin2Prg.RenameTmpFile2Tx2File( .c_OutputFile )
|
||||||
*ERROR 'No se puede generar el archivo [' + .c_OutputFile + '] porque es ReadOnly'
|
*ERROR 'No se puede generar el archivo [' + .c_OutputFile + '] porque es ReadOnly'
|
||||||
ERROR (TEXTMERGE(C_CANT_GENERATE_FILE_BECAUSE_IT_IS_READONLY_LOC))
|
ERROR (TEXTMERGE(C_CANT_GENERATE_FILE_BECAUSE_IT_IS_READONLY_LOC))
|
||||||
ENDCASE
|
ENDCASE
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
ELSE
|
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 )
|
||||||
@@ -17743,7 +17744,7 @@ DEFINE CLASS CL_DBF_RECORDS AS CL_COL_BASE
|
|||||||
FFLUSH( toFoxBin2Prg.n_FileHandle, .T. )
|
FFLUSH( toFoxBin2Prg.n_FileHandle, .T. )
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user