From: Andrey C. <sku...@us...> - 2007-05-22 08:44:30
|
Update of /cvsroot/eas-dev/eas/libeas In directory sc8-pr-cvs17:/tmp/cvs-serv18032/libeas Modified Files: protocol_raw.prg uimanager.prg Log Message: Show error of form opening. Small fixes. Index: protocol_raw.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/libeas/protocol_raw.prg,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- protocol_raw.prg 12 Mar 2007 17:14:23 -0000 1.7 +++ protocol_raw.prg 22 May 2007 08:44:27 -0000 1.8 @@ -226,7 +226,7 @@ // params: session:N local oData:=map(), cBuf, nSize, nRead, err:=map() local cBuffer:='', nTotal:=0 - local oErr, sec:=seconds() + local oErr, sec self:socket:rTimeout := 6000 self:errno := 0 @@ -253,6 +253,7 @@ cBuf := space(nSize) + sec := seconds() self:lock := .T. oErr := ErrorBlock({|e| break(e) }) begin sequence @@ -277,7 +278,6 @@ eDebug( 6, "Read error") cBuffer := '' nTotal := 0 - end sequence self:lock := .F. @@ -292,7 +292,7 @@ static function c_write( self, params ) // params: session:N, data:O local nSended, err:=map() - local oErr + local oErr, sec:=seconds() if self:socket:role != 'server' .and. valtype(params) == 'O' params:session := self:socket:handle @@ -319,5 +319,5 @@ return .F. end sequence - eDebug( 26, "Wrote",nSended,"bytes" ) + eDebug( 26, "Wrote",nSended, "bytes", seconds()-sec, "sec" ) return .T. Index: uimanager.prg =================================================================== RCS file: /cvsroot/eas-dev/eas/libeas/uimanager.prg,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- uimanager.prg 12 Mar 2007 17:14:23 -0000 1.7 +++ uimanager.prg 22 May 2007 08:44:27 -0000 1.8 @@ -117,11 +117,13 @@ if empty(vRet) eDebug( 8, "Cannot open empty form" ) + dialogBox( i18n("Error"), i18n("Unable to open form:&\nServer returns empty form"),,,NIL, IMG_ERROR ) return .F. endif if valtype(vRet) == 'O' .and. 'ERROR' $ vRet eDebug( 8, "Form open:", vRet:error ) + dialogBox( i18n("Error"), i18n("Unable to open form:&\n")+vRet:error,,,NIL, IMG_ERROR ) return .F. endif @@ -152,6 +154,7 @@ if win == NIL eDebug( 8, "Error parse form" ) + dialogBox( i18n("Error"), i18n("Error parse form"),,,NIL, IMG_ERROR ) return .F. elseif self:main == NIL self:main := win @@ -179,6 +182,7 @@ recover using oErr eDebug( 8, "Internal error:", errorMessage(oErr) ) + dialogBox( i18n("Error"), i18n("Internal form error:&\n")+errorMessage(oErr),,,NIL, IMG_ERROR ) return .F. end sequence |