From 24993aea0fab9a6a4be3eb5086e9d7c9e1494510 Mon Sep 17 00:00:00 2001 From: fernando Date: Sun, 2 Feb 2014 15:20:33 +0100 Subject: [PATCH] =?UTF-8?q?Changeset:=20152=20-=20Optimizaci=C3=B3n=20Ole?= =?UTF-8?q?=20-=20Blocksize=20ajustado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TESTS/DATOS_READONLY/FB2P_DBC.DC2 | 2 +- TESTS/DATOS_READONLY/fb2p_dbc.dbc | Bin 8968 -> 8968 bytes TESTS/DATOS_READONLY/fb2p_dbc.dct | Bin 133632 -> 138240 bytes foxbin2prg.pj2 | 4 +-- foxbin2prg.pjt | Bin 340608 -> 340608 bytes foxbin2prg.pjx | Bin 1583 -> 1583 bytes foxbin2prg.prg | 55 ++++++++++++++---------------- 7 files changed, 28 insertions(+), 33 deletions(-) diff --git a/TESTS/DATOS_READONLY/FB2P_DBC.DC2 b/TESTS/DATOS_READONLY/FB2P_DBC.DC2 index 8310436..2179979 100644 --- a/TESTS/DATOS_READONLY/FB2P_DBC.DC2 +++ b/TESTS/DATOS_READONLY/FB2P_DBC.DC2 @@ -38,7 +38,7 @@ - DRIVER={Oracle en OraClient11g_home1};SERVER=CARTERA;UID=STROSNC;PWD=STROSNC;DBQ=CARTERA;DBA=W;APA=T;EXC=F;XSM=Default;FEN=T;QTO=T;FRC=10;FDL=10;LOB=T;RST=T;BTD=F;BNF=F;BAM=IfAllSuccessful;NUM=NLS;DPM=F;MTS=T;MDI=Me;CSR=F;FWC=F;FBS=60000;TLO=O;MLD=0;ODA= + DRIVER={Oracle en OraClient11g_home1};SERVER=BDDServer;UID=BDDUser;PWD=BDDPwd;DBQ=CARTERA;DBA=W;APA=T;EXC=F;XSM=Default;FEN=T;QTO=T;FRC=10;FDL=10;LOB=T;RST=T;BTD=F;BNF=F;BAM=IfAllSuccessful;NUM=NLS;DPM=F;MTS=T;MDI=Me;CSR=F;FWC=F;FBS=60000;TLO=O;MLD=0;ODA .F. .T. 15 diff --git a/TESTS/DATOS_READONLY/fb2p_dbc.dbc b/TESTS/DATOS_READONLY/fb2p_dbc.dbc index 08c5fa24c9c1465a5ae8e63cb925c07343ba3ea2..e663ef900069390afe5579c6b750060653857050 100644 GIT binary patch delta 21 ccmeBh>u_T+;A3Li$WkfHl*O^RUbvGV06X0UbpQYW delta 21 ccmeBh>u_T+;A3Rn$WkfHw3=aay>KT#06mQbumAu6 diff --git a/TESTS/DATOS_READONLY/fb2p_dbc.dct b/TESTS/DATOS_READONLY/fb2p_dbc.dct index bf41563e18df337b30c83a9c5057836a700b56db..2efee30272540014f650ebcd9e6e993c0ec3846e 100644 GIT binary patch delta 148 zcmZpe!qKpUgM)#Aqkw^d!C|A|C&q~ioXyNk?aWM!+nJe|{<2SQU}f8UOsj#BbYk)` qt+@(LE-t~TMP;c))}fv*wm@EJF_0Y)4rT|Gr%Z0r-pB*A91Z|oxG$yv delta 35 rcmZqJ!O<{ @@ -51,7 +51,7 @@ loProject = _VFP.Projects('foxbin2prg.pjx') WITH loProject.FILES .ADD('config\config.fpw') && *< FileMetadata: Type="T" Cpid="1252" Timestamp="1132857145" ID="1131721714" ObjRev="0" /> - .ADD('foxbin2prg.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="1144997514" ID="1130644423" ObjRev="544" /> + .ADD('foxbin2prg.prg') && *< FileMetadata: Type="P" Cpid="1252" Timestamp="1145207292" ID="1130644423" ObjRev="544" /> * .ITEM('__newproject.f2b').Remove() diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt index 56a4f9bce016659dc4dd1ab78c15e2da2bb3730e..71b32ee6681461f0ed31c94783a5083da5af2e1d 100644 GIT binary patch delta 12544 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 Dk(X2Z diff --git a/foxbin2prg.pjx b/foxbin2prg.pjx index 5a3a0e708660c0ba22a3c8100e015709b548dadb..616291a8485a133e59d29ea9944709f9059878f1 100644 GIT binary patch delta 37 qcmZ3_vz~{=fRBl3Bg=Lcc2gq*a}y(z$%k0}g4srvMw5@RW&!}SFA6IF delta 37 ocmZ3_vz~{=fR9mrBg=Lcb`wiWb5lc$$%k0}LfIyhkFjO~0JvHTW&i*H diff --git a/foxbin2prg.prg b/foxbin2prg.prg index 10fc4d1..3c7a3c4 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -66,7 +66,9 @@ * 08/01/2014 FDBOZZO v1.19.3 Cambio en los timestamps de los TXT para mantener los valores vacíos que generaban muchísimas diferencias * 22/01/2014 FDBOZZO v1.19.4 Nuevo parámetro Recompile para forzar la recompilación. Ahora por defecto el binario no se recompila para ganar velocidad y evitar errores. Debe recompilar manualmente. * 22/01/2014 FDBOZZO v1.19.4 DBC: Agregado soporte para comentarios multilínea (propiedad Comment) -* 30/01/2014 FDBOZZO v1.19.5 Agregada compatibilidad con SourceSafe para Diff y Merge +* 26/01/2014 FDBOZZO v1.19.5 Agregado soporte multiidioma y traducción al Inglés +* 01/02/2014 FDBOZZO v1.19.6 Agregada compatibilidad con SourceSafe para Diff y Merge +* 02/02/2014 FDBOZZO v1.19.7 Encapsulación de objetos OLE en el propio control o clase // Blocksize ajustado * * *--------------------------------------------------------------------------------------------------- @@ -83,7 +85,6 @@ * 14/12/2013 Fidel Charny REPORTE BUG scx v1.13: La regeneración de los forms (SCX) no regenera el último registro COMMENT (arreglado en v.1.14) * 01/01/2014 Fidel Charny REPORTE BUG mnx v1.16: El menú no siempre respeta la posición original LOCATION y a veces se genera mal el MNX (se arregla en v1.17) * 05/01/2014 Fidel Charny REPORTE BUG mnx v1.17: Se genera cláusula "DO" o llamada Command cuando no Procedure ni Command que llamar // Diferencia de Case en NAME (se arregla en v1.18) -* 07/01/2014 F.D.Bozzo BUG vcx/scx v1.18: Los *métodos deben ir siempre al final en el Reserved3, si no los eventos ACCESS no se disparan * * *--------------------------------------------------------------------------------------------------- @@ -692,7 +693,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM , loFSO AS Scripting.FileSystemObject lnCodError = 0 - tcRecompile = EVL(tcRecompile,'') + tcRecompile = EVL(tcRecompile,'1') *SET DELETED ON *SET DATE YMD @@ -1379,6 +1380,7 @@ DEFINE CLASS c_conversor_base AS SESSION SET CENTURY ON SET SAFETY OFF SET TABLEPROMPT OFF + SET BLOCKSIZE TO 0 PUBLIC C_FB2PRG_CODE C_FB2PRG_CODE = '' && Contendrá todo el código generado @@ -3588,14 +3590,17 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base toObjeto._Ole2 = .get_ValueByName_FromListNamesWithValues( 'OLEObject', 'C', @laPropsAndValues ) toObjeto._ZOrder = .get_ValueByName_FromListNamesWithValues( 'ZOrder', 'I', @laPropsAndValues ) toObjeto._TimeStamp = INT( .RowTimeStamp( .get_ValueByName_FromListNamesWithValues( 'TimeStamp', 'T', @laPropsAndValues ) ) ) + toObjeto._Ole = STRCONV( .get_ValueByName_FromListNamesWithValues( 'Value', 'C', @laPropsAndValues ), 14 ) IF NOT EMPTY( toObjeto._Ole2 ) && Le agrego "OLEObject = " delante toObjeto._Ole2 = 'OLEObject = ' + toObjeto._Ole2 + CR_LF ENDIF *-- Ubico el objeto ole por su nombre (parent+objname), que no se repite. - IF toModulo.existeObjetoOLE( toObjeto._Nombre, @Z ) - toObjeto._Ole = toModulo._Ole_Objs(Z)._Value + IF EMPTY(toObjeto._Ole) && Si _Ole está vacío es porque el propio control no tiene la info y está en la cabecera (antiguo guardado) + IF toModulo.existeObjetoOLE( toObjeto._Nombre, @Z ) + toObjeto._Ole = toModulo._Ole_Objs(Z)._Value + ENDIF ENDIF EXIT @@ -3975,6 +3980,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base toClase._ProjectClassIcon = .get_ValueByName_FromListNamesWithValues( 'ProjectClassIcon', 'C', @laPropsAndValues ) toClase._ClassIcon = .get_ValueByName_FromListNamesWithValues( 'ClassIcon', 'C', @laPropsAndValues ) toClase._Ole2 = .get_ValueByName_FromListNamesWithValues( 'OLEObject', 'C', @laPropsAndValues ) + toClase._Ole = STRCONV( .get_ValueByName_FromListNamesWithValues( 'Value', 'C', @laPropsAndValues ), 14 ) ENDWITH && THIS IF NOT EMPTY( toClase._Ole2 ) && Le agrego "OLEObject = " delante @@ -4497,7 +4503,7 @@ DEFINE CLASS c_conversor_prg_a_vcx AS c_conversor_prg_a_bin VALUES ; ( 'COMMENT' ; , 'RESERVED' ; - , loClase._TimeStamp ; + , 0 ; , '' ; , '' ; , '' ; @@ -7208,8 +7214,12 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base *-- Agrego metainformación para objetos OLE IF toRegObj.BASECLASS == 'olecontrol' - TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2 - OLEObject="<>" + Parent="<>" + ObjName="<>" + OLEObject="<>" + Parent="<>" + ObjName="<>" + OLEObject="<>" - Parent="<>" - ObjName="<>" - OLEObject="<