Changeset: 368 fdbozzo - 15/07/2014 22:21:04:

This commit is contained in:
fdbozzo
2014-07-15 22:21:13 +02:00
2 changed files with 27 additions and 14 deletions

Binary file not shown.

View File

@@ -93,7 +93,7 @@
* 06/07/2014 FDBOZZO v1.19.26 Mejora: Cuando se convierten binarios a texto, los CHR(0) pasan tambi<62>n, pudiendo provocar falsa detecci<63>n como binario. Se agrega opci<63>n para quitar los NULLs. (Matt Slay) * 06/07/2014 FDBOZZO v1.19.26 Mejora: Cuando se convierten binarios a texto, los CHR(0) pasan tambi<62>n, pudiendo provocar falsa detecci<63>n como binario. Se agrega opci<63>n para quitar los NULLs. (Matt Slay)
* 27/06/2014 FDBOZZO v1.19.26 Mejora: Si el campo memo "methods" de los vcx/scx contiene asteriscos fuera de lugar (que no deber<65>a), FoxBin2Prg lo procesa igualmente. (Daniel S<>nchez) * 27/06/2014 FDBOZZO v1.19.26 Mejora: Si el campo memo "methods" de los vcx/scx contiene asteriscos fuera de lugar (que no deber<65>a), FoxBin2Prg lo procesa igualmente. (Daniel S<>nchez)
* 06/07/2014 FDBOZZO v1.19.26 Bug Fix cfg: ExtraBackupLevel no se tiene en cuenta cuando se usa multi-configuraci<63>n * 06/07/2014 FDBOZZO v1.19.26 Bug Fix cfg: ExtraBackupLevel no se tiene en cuenta cuando se usa multi-configuraci<63>n
* 02/06/2014 DH v1.19.27 Mejora: Agregado soporte para exportar datos para DIFF (no para importar) (Doug Hennig/FDBOZZO) * 02/06/2014 DH/FDBOZZO v1.19.27 Mejora: Agregado soporte para exportar datos para DIFF (no para importar)
* </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES> * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
* *
*--------------------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------------------
@@ -15900,7 +15900,7 @@ DEFINE CLASS CL_DBF_TABLE AS CL_CUS_BASE
#ENDIF #ENDIF
TRY TRY
LOCAL lcText, loEx AS EXCEPTION ; LOCAL lcText, lcTableCFG, lcIndexKey, lcIndexFile, loEx AS EXCEPTION ;
, loRecords AS CL_DBF_RECORDS OF 'FOXBIN2PRG.PRG' ; , loRecords AS CL_DBF_RECORDS OF 'FOXBIN2PRG.PRG' ;
, loFields AS CL_DBF_FIELDS OF 'FOXBIN2PRG.PRG' ; , loFields AS CL_DBF_FIELDS OF 'FOXBIN2PRG.PRG' ;
, loIndexes AS CL_DBF_INDEXES OF 'FOXBIN2PRG.PRG' , loIndexes AS CL_DBF_INDEXES OF 'FOXBIN2PRG.PRG'
@@ -15924,25 +15924,34 @@ DEFINE CLASS CL_DBF_TABLE AS CL_CUS_BASE
*-- Fields *-- Fields
loFields = THIS._Fields loFields = THIS._Fields
DO CASE *** DH 06/02/2014: passed variables to toText
CASE INLIST(toFoxBin2Prg.DBF_Conversion_Support, 1, 2) && BIN2PRG o PRG2BIN lcText = lcText + loFields.toText(@laFields, @lnFieldCount)
lcText = lcText + loFields.toText()
CASE toFoxBin2Prg.DBF_Conversion_Support = 4 && BIN2PRG (DATA EXPORT FOR DIFF) *-- Indexes
*** DH 06/02/2014: passed variables to toText loIndexes = THIS._Indexes
lcText = lcText + loFields.toText(@laFields, @lnFieldCount) lcText = lcText + loIndexes.toText( '', '', tc_InputFile )
*-- Indexes IF toFoxBin2Prg.DBF_Conversion_Support = 4 && BIN2PRG (DATA EXPORT FOR DIFF)
loIndexes = THIS._Indexes *-- If table CFG exists, use it to order records. FDBOZZO. 2014/06/15
lcText = lcText + loIndexes.toText( '', '', tc_InputFile ) lcTableCFG = tc_InputFile + '.CFG'
IF FILE(lcTableCFG)
toFoxBin2Prg.writeLog()
toFoxBin2Prg.writeLog('* Found configuration file: ' + lcTableCFG)
lcIndexKey = ALLTRIM( FILETOSTR(lcTableCFG), 0, ' ', CHR(13), CHR(10) )
IF NOT EMPTY(lcIndexKey)
lcIndexFile = FORCEEXT(tc_InputFile,'IDX')
INDEX ON &lcIndexKey. TO (lcIndexFile) COMPACT
toFoxBin2Prg.writeLog(' > Using Index order key: ' + lcIndexKey)
ENDIF
ENDIF
*** DH 06/02/2014: added _Records *** DH 06/02/2014: added _Records
loRecords = THIS._Records loRecords = THIS._Records
lcText = lcText + loRecords.toText(@laFields, lnFieldCount) lcText = lcText + loRecords.toText(@laFields, lnFieldCount)
OTHERWISE ENDIF
*-- Ignorar soporte no contemplado
ENDCASE
TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
<<C_TABLE_F>> <<C_TABLE_F>>
@@ -15960,6 +15969,10 @@ DEFINE CLASS CL_DBF_TABLE AS CL_CUS_BASE
FINALLY FINALLY
STORE NULL TO loIndexes, loFields, loRecords STORE NULL TO loIndexes, loFields, loRecords
RELEASE loFields, loIndexes, loRecords RELEASE loFields, loIndexes, loRecords
IF NOT EMPTY(lcIndexFile) AND FILE(lcIndexFile)
SET INDEX TO
ERASE (lcIndexFile)
ENDIF
ENDTRY ENDTRY
RETURN lcText RETURN lcText