Changeset: 196 fdbozzo - 08/03/2014 14:40:36:

- Arreglo bug: Si _memberdata contiene CR entre sus valores, esos valores pueden perderse al regenerar el tx2
This commit is contained in:
fdbozzo
2014-03-08 16:15:57 +01:00
parent 816009f568
commit f767bb4823

View File

@@ -1877,7 +1877,7 @@ DEFINE CLASS c_conversor_base AS SESSION
FOR I = 1 TO OCCURS( '/>', tcValue ) FOR I = 1 TO OCCURS( '/>', tcValue )
TEXT TO lcValue TEXTMERGE ADDITIVE NOSHOW FLAGS 1+2 PRETEXT 1+2 TEXT TO lcValue TEXTMERGE ADDITIVE NOSHOW FLAGS 1+2 PRETEXT 1+2
<<STREXTRACT( tcValue, '<memberdata ', '/>', I, 1+4 )>> <<CHRTRAN( STREXTRACT( tcValue, '<memberdata ', '/>', I, 1+4 ), CR_LF, ' ' )>>
ENDTEXT ENDTEXT
ENDFOR ENDFOR
@@ -2207,7 +2207,7 @@ DEFINE CLASS c_conversor_base AS SESSION
FOR I = 1 TO OCCURS( '/>', tcValue ) FOR I = 1 TO OCCURS( '/>', tcValue )
TEXT TO lcValue TEXTMERGE ADDITIVE NOSHOW FLAGS 1+2 PRETEXT 1+2 TEXT TO lcValue TEXTMERGE ADDITIVE NOSHOW FLAGS 1+2 PRETEXT 1+2
<<>> <<STREXTRACT( tcValue, '<memberdata ', '/>', I, 1+4 )>> <<>> <<CHRTRAN( STREXTRACT( tcValue, '<memberdata ', '/>', I, 1+4 ), CR_LF, ' ' )>>
ENDTEXT ENDTEXT
ENDFOR ENDFOR
@@ -2294,6 +2294,8 @@ DEFINE CLASS c_conversor_base AS SESSION
lcPropName = SUBSTR(tcPropName,5) lcPropName = SUBSTR(tcPropName,5)
CASE NOT tcOperation == 'SETNAME' CASE NOT tcOperation == 'SETNAME'
ERROR C_ONLY_SETNAME_AND_GETNAME_RECOGNIZED_LOC ERROR C_ONLY_SETNAME_AND_GETNAME_RECOGNIZED_LOC
CASE lcPropName == 'FRXDataSession' && En un VCX lo v<> primero de todo y tambi<62>n luego de Height <20>?
lcPropName = 'A001' + lcPropName
CASE lcPropName == 'ErasePage' && PageFrame: Debe estar antes que PageCount CASE lcPropName == 'ErasePage' && PageFrame: Debe estar antes que PageCount
lcPropName = 'A002' + lcPropName lcPropName = 'A002' + lcPropName
CASE lcPropName == 'PageCount' && PageFrame: Debe estar antes que ActivePage CASE lcPropName == 'PageCount' && PageFrame: Debe estar antes que ActivePage
@@ -2318,13 +2320,13 @@ DEFINE CLASS c_conversor_base AS SESSION
lcPropName = 'A040' + lcPropName lcPropName = 'A040' + lcPropName
CASE lcPropName == 'Tag' CASE lcPropName == 'Tag'
lcPropName = 'A045' + lcPropName lcPropName = 'A045' + lcPropName
CASE lcPropName == 'DefTop' && Propied con evaluaci<63>n: Debe estar antes que Top CASE lcPropName == 'DefTop' && Propiedad con evaluaci<63>n: Debe estar antes que Top
lcPropName = 'A046' + lcPropName lcPropName = 'A046' + lcPropName
CASE lcPropName == 'DefLeft' && Propied con evaluaci<63>n: Debe estar antes que Left CASE lcPropName == 'DefLeft' && Propiedad con evaluaci<63>n: Debe estar antes que Left
lcPropName = 'A047' + lcPropName lcPropName = 'A047' + lcPropName
CASE lcPropName == 'DefHeight' && Propied con evaluaci<63>n: Debe estar antes que Height CASE lcPropName == 'DefHeight' && Propiedad con evaluaci<63>n: Debe estar antes que Height
lcPropName = 'A048' + lcPropName lcPropName = 'A048' + lcPropName
CASE lcPropName == 'DefWidth' && Propied con evaluaci<63>n: Debe estar antes que Width CASE lcPropName == 'DefWidth' && Propiedad con evaluaci<63>n: Debe estar antes que Width
lcPropName = 'A049' + lcPropName lcPropName = 'A049' + lcPropName
CASE lcPropName == 'Top' CASE lcPropName == 'Top'
lcPropName = 'A050' + lcPropName lcPropName = 'A050' + lcPropName
@@ -4387,7 +4389,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
I = I - 1 I = I - 1
IF NOT EMPTY(toClase._Comentario) IF NOT EMPTY(toClase._Comentario)
toClase._Comentario = SUBSTR( toClase._Comentario, 3 ) && Quito el primer CR+LF toClase._Comentario = SUBSTR( toClase._Comentario, 3 ) + CR_LF && Quito el primer CR+LF
ENDIF ENDIF
ENDIF ENDIF