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

Changeset: 361 fdbozzo - 14/07/2014 18:20:21:

Browse Source 
Optimizaciones sobre el código de Doug Hennig
This commit is contained in:
fdbozzo
2014-07-15 20:38:03 +02:00
parent f69cdd73c9
commit dfd5386ab1
1 changed files with 63 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
foxbin2prg.prg
View File

@@ -272,7 +272,7 @@ LPARAMETERS tc_InputFile, tcType, tcTextName, tlGenText, tcDontShowErrors, tcDeb
*** DH 06/02/2014: added additional constants *** DH 06/02/2014: added additional constants
#DEFINE C_RECORDS_I '<RECORDS>' #DEFINE C_RECORDS_I '<RECORDS>'
#DEFINE C_RECORDS_F '</RECORDS>' #DEFINE C_RECORDS_F '</RECORDS>'
#DEFINE C_RECORD_I '<RECORD>' #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_RECORD_F '</RECORD>'
#DEFINE C_RECNO_I '<RECNO>' #DEFINE C_RECNO_I '<RECNO>'
#DEFINE C_RECNO_F '</RECNO>' #DEFINE C_RECNO_F '</RECNO>'
@@ -15381,6 +15381,9 @@ DEFINE CLASS CL_DBF_TABLE AS CL_CUS_BASE
LOCAL lcText, loEx AS EXCEPTION ; LOCAL lcText, loEx AS EXCEPTION ;
, 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'
*** DH 06/02/2014: created variables
LOCAL laFields[1], lnFieldCount
STORE NULL TO loIndexes, loFields STORE NULL TO loIndexes, loFields
lcText = '' lcText = ''
@@ -15395,13 +15398,9 @@ DEFINE CLASS CL_DBF_TABLE AS CL_CUS_BASE
<<>> <FileType_Descrip><<tc_FileTypeDesc>></FileType_Descrip> <<>> <FileType_Descrip><<tc_FileTypeDesc>></FileType_Descrip>
ENDTEXT ENDTEXT
*** DH 06/02/2014: created variables
local laFields[1], lnFieldCount
*-- Fields *-- Fields
loFields = THIS._Fields loFields = THIS._Fields
*** DH 06/02/2014: passed variables to toText *** DH 06/02/2014: passed variables to toText
* lcText = lcText + loFields.toText()
lcText = lcText + loFields.toText(@laFields, @lnFieldCount) lcText = lcText + loFields.toText(@laFields, @lnFieldCount)
*-- Indexes *-- Indexes
@@ -15409,7 +15408,7 @@ DEFINE CLASS CL_DBF_TABLE AS CL_CUS_BASE
lcText = lcText + loIndexes.toText( '', '', tc_InputFile ) lcText = lcText + loIndexes.toText( '', '', tc_InputFile )
*** DH 06/02/2014: added _Records *** DH 06/02/2014: added _Records
lcText = lcText + This._Records.toText(@laFields, lnFieldCount) lcText = lcText + THIS._Records.toText(@laFields, lnFieldCount)
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>>
@@ -16022,9 +16021,9 @@ DEFINE CLASS CL_DBF_RECORDS AS CL_COL_BASE
loRecord = CREATEOBJECT('CL_DBF_RECORD') loRecord = CREATEOBJECT('CL_DBF_RECORD')
scan SCAN
lcText = lcText + loRecord.toText(@taFields, tnField_Count) lcText = lcText + loRecord.toText(@taFields, tnField_Count)
endscan ENDSCAN
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_RECORDS_F>> <<>> <<C_RECORDS_F>>
@@ -16084,28 +16083,41 @@ DEFINE CLASS CL_DBF_RECORD AS CL_CUS_BASE
EXTERNAL ARRAY taFields EXTERNAL ARRAY taFields
TRY TRY
LOCAL I, lcText, loEx AS EXCEPTION, lcField, luValue LOCAL I, lcText, loEx AS EXCEPTION, lcField, luValue, lcFieldType
lcText = '' 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 TEXT TO lcText TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
<<>> <<C_RECORD_I>> <<>> <<STRTRAN( C_RECORD_I, '##', TRANSFORM(RECNO()) )>>
<<>> <<C_RECNO_I>><<recno()>><<C_RECNO_F>> ENDTEXT
endtext
for I = 1 to tnField_Count FOR I = 1 TO tnField_Count
lcField = taFields[I, 1] lcField = taFields[I, 1]
luValue = evaluate(lcField) lcFieldType = taFields[I, 2]
do case
case taFields[I, 2] $ 'CMV' *** FDBOZZO 2014/07/15: Added field restrictions on binary and general fields
luValue = trim(luValue) DO CASE
if This.Encode(luValue) <> luValue 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 + ']]>' luValue = '<![CDATA[' + luValue + ']]>'
endif This.Encode(luValue) <> luValue ENDIF THIS.Encode(luValue) <> luValue
endcase ENDCASE
TEXT TO lcText TEXTMERGE NOSHOW flags 1+2 PRETEXT 1+2 additive TEXT TO lcText TEXTMERGE NOSHOW flags 1+2 PRETEXT 1+2 additive
<<>> <<'<' + lcField + '>'>><<luValue>></<<lcField>>> <<>> <<'<' + lcField + '>'>><<luValue>></<<lcField>>>
endtext ENDTEXT
next NEXT
TEXT TO lcText TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 additive TEXT TO lcText TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 additive
<<>> <<C_RECORD_F>> <<>> <<C_RECORD_F>>
@@ -16122,22 +16134,22 @@ DEFINE CLASS CL_DBF_RECORD AS CL_CUS_BASE
ENDTRY ENDTRY
RETURN lcText RETURN lcText
endproc ENDPROC
procedure Encode PROCEDURE Encode
lparameters tcString LPARAMETERS tcString
local lcString LOCAL lcString
lcString = strtran(tcString, '&', '&amp;') lcString = STRTRAN(tcString, '&', '&amp;')
lcString = strtran(lcString, '>', '&gt;') lcString = STRTRAN(lcString, '>', '&gt;')
lcString = strtran(lcString, '<', '&lt;') lcString = STRTRAN(lcString, '<', '&lt;')
lcString = strtran(lcString, '"', '&quot;') lcString = STRTRAN(lcString, '"', '&quot;')
lcString = strtran(lcString, "'", '&#39;') lcString = STRTRAN(lcString, "'", '&#39;')
lcString = strtran(lcString, '/', '&#47;') lcString = STRTRAN(lcString, '/', '&#47;')
lcString = strtran(lcString, chr(13), '&#13;') lcString = STRTRAN(lcString, CHR(13), '&#13;')
lcString = strtran(lcString, chr(10), '&#10;') lcString = STRTRAN(lcString, CHR(10), '&#10;')
lcString = strtran(lcString, chr(9), '&#9;') lcString = STRTRAN(lcString, CHR(9), '&#9;')
return lcString RETURN lcString
endproc ENDPROC
ENDDEFINE ENDDEFINE