Changeset: 369 fdbozzo - 15/07/2014 22:21:19:

foxbin2prg.cfg

@@ -17,7 +17,7 @@
 * OptimizeByFilestamp: 0		&& Optimize file regeneration depending on file timestamp / Optimizar la regeneraci<63>n de archivos dependiendo del timestamp de archivo
 * AllowMultiConfig: 1			&& 1=Allow CFG files per directory. if no CFG found, then use Main CFG. 0=Only use Main CFG
 * DropNullCharsFromCode: 1		&& 1=Drop NULL chars from source code / 0=Leave Nulls in code, if any
-* XXX_Conversion_Support: N		&& 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge)
+* XXX_Conversion_Support: N		&& 0=No support, 1=Generate TXT only (Diff), 2=Generate TXT and BIN (Merge), 4=Generate TXT with DATA for DIFF (DBF only)
 * PJX_Conversion_Support: 2		&& Default value
 * VCX_Conversion_Support: 2		&& Default value
 * SCX_Conversion_Support: 2		&& Default value

foxbin2prg.pj2

@@ -23,10 +23,10 @@ _CompanyName = "Fernando D. Bozzo"
 _FileDescription = "Conversor bidireccional de binarios FoxPro 9 (scx,vcx,pjx) a texto para sustituir al scctext :-)"
 _LegalCopyright = "Creative Commons 4:	Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
 _LegalTrademark = "Creative Commons 4:	Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
-_ProductName = " FOXBIN2PRG v1.19.26"
+_ProductName = " FOXBIN2PRG v1.19.27"
 _MajorVer = "1"
 _MinorVer = "19"
-_Revision = "26"
+_Revision = "27"
 _LanguageID = "1034"
 _AutoIncrement = "0"
 *</DevInfo>

foxbin2prg.prg

@@ -93,6 +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)
 * 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
+* 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>
 *
 *---------------------------------------------------------------------------------------------------
@@ -129,6 +130,7 @@
 * 17/06/2014	Pedro Guti<74>rrez M.	MEJORA v1.19.24: Si durante la generaci<63>n de binarios o de textos se producen errores, mostrar un mensaje avisando de ello (Agregado en v1.19.25)
 * 02/07/2014	Matt Slay			MEJORA v1.19.25: Se filtran algunos CHR(0) de los binarios al tx2, provocando que a veces no sea reconocido como texto. Deber<65>an poderse quitar los NULLs (Arreglado en v1.19.26)
 * 27/06/2014	Daniel S<>nchez		MEJORA v1.19.25: Si el campo memo "methods" de los vcx/scx contiene asteriscos fuera de lugar (que no deber<65>a), FoxBin2Prg falla. Deber<65>a poder procesarlo igual.
+* 02/06/2014	Doug Hennig			MEJORA v1.19.22: Agregada funcionalidad para exportar los datos de las tablas al archivo db2 (Agregado en v1.19.27)
 * </TESTEO Y REPORTE DE BUGS (AGRADECIMIENTOS)>
 *
 *---------------------------------------------------------------------------------------------------
@@ -285,6 +287,15 @@ LPARAMETERS tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDeb
 #DEFINE C_NULL_CHAR					CHR(0)
 #DEFINE CR_LF						C_CR + C_LF
 #DEFINE C_MPROPHEADER				REPLICATE( CHR(1), 517 )
+
+*** DH 06/02/2014: added additional constants
+#DEFINE C_RECORDS_I					'<RECORDS>'
+#DEFINE C_RECORDS_F					'</RECORDS>'
+#DEFINE C_RECORD_I					'<RECORD num="##">'	&& *** FDBOZZO 2014/07/15: Optimized RECORD tag adding num property to not use REGNUM field
+#DEFINE C_RECORD_F					'</RECORD>'
+#DEFINE C_RECNO_I					'<RECNO>'
+#DEFINE C_RECNO_F					'</RECNO>'
+
 *-- Fin / End
 
 *-- From FOXPRO.H
@@ -1221,7 +1232,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 
 						CASE LEFT( laConfig(I), 23 ) == LOWER('DBF_Conversion_Support:')
 							lcValue	= ALLTRIM( SUBSTR( laConfig(I), 24 ) )
-								IF INLIST( lcValue, '0', '1', '2' ) THEN
+							IF INLIST( lcValue, '0', '1', '2', '4' ) THEN
 								lo_CFG.DBF_Conversion_Support	= INT( VAL( lcValue ) )
 								.writeLog( JUSTFNAME(lcConfigFile) + ' > DBF_Conversion_Support: ' + TRANSFORM(lo_CFG.DBF_Conversion_Support) )
 							ENDIF
@@ -1361,14 +1372,14 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 		LPARAMETERS tcExt
 		LOCAL llTieneSoporte
 		WITH THIS AS c_foxbin2prg OF 'FOXBIN2PRG.PRG'
-			llTieneSoporte	= ICASE( tcExt == .c_PJ2, .PJX_Conversion_Support >= 2 ;
+			llTieneSoporte	= ICASE( tcExt == .c_PJ2, .PJX_Conversion_Support = 2 ;
-				, tcExt == .c_VC2, .VCX_Conversion_Support >= 2 ;
+				, tcExt == .c_VC2, .VCX_Conversion_Support = 2 ;
-				, tcExt == .c_SC2, .SCX_Conversion_Support >= 2 ;
+				, tcExt == .c_SC2, .SCX_Conversion_Support = 2 ;
-				, tcExt == .c_FR2, .FRX_Conversion_Support >= 2 ;
+				, tcExt == .c_FR2, .FRX_Conversion_Support = 2 ;
-				, tcExt == .c_LB2, .LBX_Conversion_Support >= 2 ;
+				, tcExt == .c_LB2, .LBX_Conversion_Support = 2 ;
-				, tcExt == .c_MN2, .MNX_Conversion_Support >= 2 ;
+				, tcExt == .c_MN2, .MNX_Conversion_Support = 2 ;
-				, tcExt == .c_DB2, .DBF_Conversion_Support >= 2 ;
+				, tcExt == .c_DB2, .DBF_Conversion_Support = 2 ;
-				, tcExt == .c_DC2, .DBC_Conversion_Support >= 2 ;
+				, tcExt == .c_DC2, .DBC_Conversion_Support = 2 ;
 				, .F. )
 		ENDWITH && THIS
 		RETURN llTieneSoporte
@@ -1844,7 +1855,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
 					.ChangeFileAttribute( FORCEEXT( .c_InputFile, .c_LB2 ), '+N' )
 
 				CASE lcExtension = 'DBF'
-					IF NOT INLIST(.DBF_Conversion_Support, 1, 2)
+					IF NOT INLIST(.DBF_Conversion_Support, 1, 2, 4)
 						ERROR (TEXTMERGE(C_FILE_NAME_IS_NOT_SUPPORTED_LOC))
 					ENDIF
 					.c_OutputFile	= FORCEEXT( .c_InputFile, .c_DB2 )
@@ -11140,7 +11151,7 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
 
 				*-- Header
 				loTable			= CREATEOBJECT('CL_DBF_TABLE')
-				C_FB2PRG_CODE	= C_FB2PRG_CODE + loTable.toText( ln_HexFileType, ll_FileHasCDX, ll_FileHasMemo, ll_FileIsDBC, lc_DBC_Name, .c_InputFile, lc_FileTypeDesc )
+				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
@@ -15794,6 +15805,8 @@ DEFINE CLASS CL_DBF_TABLE AS CL_CUS_BASE
 		*--
 		THIS.ADDOBJECT("_Fields", "CL_DBF_FIELDS")
 		THIS.ADDOBJECT("_Indexes", "CL_DBF_INDEXES")
+		*** DH 06/02/2014: added _Records
+		THIS.ADDOBJECT("_Records", "CL_DBF_RECORDS")
 	ENDPROC
 
 
@@ -15878,14 +15891,23 @@ DEFINE CLASS CL_DBF_TABLE AS CL_CUS_BASE
 		* tc_DBC_Name				(v! IN    ) Nombre del DBC (si tiene)
 		* tc_InputFile				(v! IN    ) Nombre del archivo de salida
 		* tc_FileTypeDesc			(v! IN    ) Descripci<63>n del Tipo de archivo
+		* toFoxBin2Prg				(@! IN    ) Referencia de toFoxBin2Prg
 		*---------------------------------------------------------------------------------------------------
-		LPARAMETERS tn_HexFileType, tl_FileHasCDX, tl_FileHasMemo, tl_FileIsDBC, tc_DBC_Name, tc_InputFile, tc_FileTypeDesc
+		LPARAMETERS tn_HexFileType, tl_FileHasCDX, tl_FileHasMemo, tl_FileIsDBC, tc_DBC_Name, tc_InputFile, tc_FileTypeDesc, toFoxBin2Prg
+
+		#IF .F.
+			LOCAL toFoxBin2Prg AS c_foxbin2prg OF 'FOXBIN2PRG.PRG'
+		#ENDIF
 
 		TRY
-			LOCAL lcText, loEx AS EXCEPTION ;
+			LOCAL lcText, lcTableCFG, lcIndexKey, lcIndexFile, loEx AS EXCEPTION ;
+				, loRecords AS CL_DBF_RECORDS OF 'FOXBIN2PRG.PRG' ;
 				, loFields AS CL_DBF_FIELDS OF 'FOXBIN2PRG.PRG' ;
 				, loIndexes AS CL_DBF_INDEXES OF 'FOXBIN2PRG.PRG'
-			STORE NULL TO loIndexes, loFields
+			*** DH 06/02/2014: created variables
+			LOCAL laFields[1], lnFieldCount
+
+			STORE NULL TO loIndexes, loFields, loRecords
 			lcText	= ''
 
 			TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
@@ -15901,12 +15923,36 @@ DEFINE CLASS CL_DBF_TABLE AS CL_CUS_BASE
 
 			*-- Fields
 			loFields	= THIS._Fields
-			lcText		= lcText + loFields.toText()
+
+			*** DH 06/02/2014: passed variables to toText
+			lcText		= lcText + loFields.toText(@laFields, @lnFieldCount)
 
 			*-- Indexes
 			loIndexes	= THIS._Indexes
 			lcText		= lcText + loIndexes.toText( '', '', tc_InputFile )
 
+			IF toFoxBin2Prg.DBF_Conversion_Support = 4	&& BIN2PRG (DATA EXPORT FOR DIFF)
+				*-- If table CFG exists, use it to order records. FDBOZZO. 2014/06/15
+				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
+				loRecords	= THIS._Records
+				lcText = lcText + loRecords.toText(@laFields, lnFieldCount)
+
+			ENDIF
+
 			TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
 				<<C_TABLE_F>>
 				<<>>
@@ -15921,8 +15967,12 @@ DEFINE CLASS CL_DBF_TABLE AS CL_CUS_BASE
 			THROW
 
 		FINALLY
-			STORE NULL TO loIndexes, loFields
+			STORE NULL TO loIndexes, loFields, loRecords
-			RELEASE loFields, loIndexes
+			RELEASE loFields, loIndexes, loRecords
+			IF NOT EMPTY(lcIndexFile) AND FILE(lcIndexFile)
+				SET INDEX TO
+				ERASE (lcIndexFile)
+			ENDIF
 		ENDTRY
 
 		RETURN lcText
@@ -16473,6 +16523,185 @@ DEFINE CLASS CL_DBF_INDEX AS CL_CUS_BASE
 
 ENDDEFINE
 
+*** DH 06/02/2014: added classes CL_DBF_RECORDS and CL_DBF_RECORD
+
+*******************************************************************************************************************
+DEFINE CLASS CL_DBF_RECORDS AS CL_COL_BASE
+	#IF .F.
+		LOCAL THIS AS CL_DBF_RECORDS OF 'FOXBIN2PRG.PRG'
+	#ENDIF
+
+
+	*******************************************************************************************************************
+	PROCEDURE analizarBloque
+		*---------------------------------------------------------------------------------------------------
+		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
+		* tcLine					(@! IN/OUT) Contenido de la l<>nea en an<61>lisis
+		* taCodeLines				(@! IN    ) Array de l<>neas del programa analizado
+		* I							(@! IN/OUT) N<>mero de l<>nea en an<61>lisis
+		* tnCodeLines				(@! IN    ) Cantidad de l<>neas del programa analizado
+		*---------------------------------------------------------------------------------------------------
+		LPARAMETERS tcLine, taCodeLines, I, tnCodeLines
+		*** DH 06/02/2014: not implemented
+	ENDPROC
+
+
+	PROCEDURE toText
+		*---------------------------------------------------------------------------------------------------
+		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
+		* taFields					(@! IN    ) Array de informaci<63>n de campos
+		* tnField_Count				(v! IN    ) Cantidad de campos
+		*---------------------------------------------------------------------------------------------------
+		LPARAMETERS taFields, tnField_Count
+
+		EXTERNAL ARRAY taFields
+
+		TRY
+			LOCAL lcText, loEx AS EXCEPTION ;
+				, loRecord AS CL_DBF_RECORD OF 'FOXBIN2PRG.PRG'
+			lcText = ''
+
+			TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+				<<>>
+				<<>>	<<C_RECORDS_I>>
+			ENDTEXT
+
+			loRecord = CREATEOBJECT('CL_DBF_RECORD')
+
+			SCAN
+				lcText	= lcText + loRecord.toText(@taFields, tnField_Count)
+			ENDSCAN
+
+			TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+				<<>>	<<C_RECORDS_F>>
+				<<>>
+			ENDTEXT
+
+
+		CATCH TO loEx
+			IF THIS.l_Debug AND _VFP.STARTMODE = 0
+				SET STEP ON
+			ENDIF
+
+			THROW
+
+		FINALLY
+			STORE NULL TO loRecord
+			RELEASE loRecord
+
+		ENDTRY
+
+		RETURN lcText
+	ENDPROC
+
+
+ENDDEFINE
+
+
+*******************************************************************************************************************
+DEFINE CLASS CL_DBF_RECORD AS CL_CUS_BASE
+	#IF .F.
+		LOCAL THIS AS CL_DBF_RECORD OF 'FOXBIN2PRG.PRG'
+	#ENDIF
+
+
+	*******************************************************************************************************************
+	PROCEDURE analizarBloque
+		*---------------------------------------------------------------------------------------------------
+		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
+		* tcLine					(@! IN/OUT) Contenido de la l<>nea en an<61>lisis
+		* taCodeLines				(@! IN    ) Array de l<>neas del programa analizado
+		* I							(@! IN/OUT) N<>mero de l<>nea en an<61>lisis
+		* tnCodeLines				(@! IN    ) Cantidad de l<>neas del programa analizado
+		*---------------------------------------------------------------------------------------------------
+		LPARAMETERS tcLine, taCodeLines, I, tnCodeLines
+		*** DH 06/02/2014: not implemented
+	ENDPROC
+
+
+	PROCEDURE toText
+		*---------------------------------------------------------------------------------------------------
+		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
+		* taFields					(@! IN    ) Array de informaci<63>n de campos
+		* tnField_Count				(@! IN    ) Cantidad de campos
+		*---------------------------------------------------------------------------------------------------
+		LPARAMETERS taFields, tnField_Count
+
+		EXTERNAL ARRAY taFields
+
+		TRY
+			LOCAL I, lcText, loEx AS EXCEPTION, lcField, luValue, lcFieldType
+			lcText	= ''
+
+			*** FDBOZZO 2014/07/15: New "num" property invalidates the use of REGNUM field
+			TEXT TO lcText TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+				<<>>		<<STRTRAN( C_RECORD_I, '##', TRANSFORM(RECNO()) )>>
+			ENDTEXT
+
+			FOR I = 1 TO tnField_Count
+				lcField		= taFields[I, 1]
+				lcFieldType	= taFields[I, 2]
+
+				*** FDBOZZO 2014/07/15: Added field restrictions on binary and general fields
+				DO CASE
+				CASE lcFieldType == 'G'
+					luValue		= 'GENERAL FIELD NOT SUPPORTED'
+				CASE lcFieldType == 'W'
+					luValue		= 'BLOB FIELD NOT SUPPORTED'
+				CASE lcFieldType == 'Q'
+					luValue		= 'VARBINARY FIELD NOT SUPPORTED'
+				OTHERWISE
+					luValue		= EVALUATE(lcField)
+				ENDCASE
+
+				DO CASE
+				CASE taFields[I, 2] $ 'CMV'
+					luValue = TRIM(luValue)
+					IF THIS.Encode(luValue) <> luValue
+						luValue = '<![CDATA[' + luValue + ']]>'
+					ENDIF THIS.Encode(luValue) <> luValue
+				ENDCASE
+				TEXT TO lcText TEXTMERGE NOSHOW flags 1+2 PRETEXT 1+2 additive
+					<<>>			<<'<' + lcField + '>'>><<luValue>></<<lcField>>>
+				ENDTEXT
+			NEXT
+
+			TEXT TO lcText TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 additive
+				<<>>		<<C_RECORD_F>>
+			ENDTEXT
+
+
+		CATCH TO loEx
+			IF THIS.l_Debug AND _VFP.STARTMODE = 0
+				SET STEP ON
+			ENDIF
+
+			THROW
+
+		ENDTRY
+
+		RETURN lcText
+	ENDPROC
+
+	PROCEDURE Encode
+		LPARAMETERS tcString
+		LOCAL lcString
+		lcString = STRTRAN(tcString, '&',     '&amp;')
+		lcString = STRTRAN(lcString, '>',     '&gt;')
+		lcString = STRTRAN(lcString, '<',     '&lt;')
+		lcString = STRTRAN(lcString, '"',     '&quot;')
+		lcString = STRTRAN(lcString, "'",     '&#39;')
+		lcString = STRTRAN(lcString, '/',     '&#47;')
+		lcString = STRTRAN(lcString, CHR(13), '&#13;')
+		lcString = STRTRAN(lcString, CHR(10), '&#10;')
+		lcString = STRTRAN(lcString, CHR(9),  '&#9;')
+		RETURN lcString
+	ENDPROC
+
+ENDDEFINE
+
+*** DH 06/02/2014: end of added classes
+
 
 *******************************************************************************************************************
 DEFINE CLASS CL_PROJ_SRV_HEAD AS CL_CUS_BASE