fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-10-12 14:19 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/hbhttpd/core.prg
  * contrib/hbhttpd/widgets.prg
  * contrib/hbpgsql/tests/cache.prg
  * extras/hbxlsxml/xlsxml_s.prg
  * extras/hbxlsxml/xlsxml_y.prg
  * extras/hbxlsxml/xlsxml.prg
  * extras/httpsrv/cgifunc.prg
  * extras/httpsrv/cookie.prg
  * extras/httpsrv/session.prg
  * extras/httpsrv/uhttpd.prg
  * src/rtl/dirscan.prg
    % LTRIM(STR(x,y)) converted to hb_ntos() where y had
      no significance or just limited the width unnecessarily
    % ValType() usage converted to HB_IS*() or optimized
      by rearragement of code or using SWITCH/CASE
This commit is contained in:
Viktor Szakats
2012-10-12 12:21:46 +00:00
parent 06fe543d39
commit 16d730147d
12 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/extras/httpsrv/cgifunc.prg
View File

@@ -666,18 +666,18 @@ RETURN replicate( " ", n ) //" "
STATIC FUNCTION FT_ELAPSED(dStart, dEnd, cTimeStart, cTimeEnd)
LOCAL nTotalSec, nCtr, nConstant, nTemp, aRetVal[4,2]
IF ! ( VALTYPE(dStart) $ 'DC' )
dStart := DATE()
ELSEIF VALTYPE(dStart) == 'C'
IF HB_ISSTRING( dStart )
cTimeStart := dStart
dStart := DATE()
ELSEIF ! HB_ISDATE( dStart )
dStart := DATE()
ENDIF
IF ! ( VALTYPE(dEnd) $ 'DC' )
dEnd := DATE()
ELSEIF VALTYPE(dEnd) == 'C'
IF HB_ISSTRING( dEnd )
cTimeEnd := dEnd
dEnd := DATE()
ELSEIF ! HB_ISDATE( dEnd )
dEnd := DATE()
ENDIF
iif( ! HB_ISSTRING( cTimeStart ), cTimeStart := '00:00:00', )

2
harbour/extras/httpsrv/cookie.prg
View File

@@ -138,7 +138,7 @@ METHOD SetCookie( cCookieName, xValue, cDomain, cPath, cExpires, lSecure, lHttpO
IF cExpires != NIL
cStr += "; expires=" + cExpires
ENDIF
IF ValType( lSecure ) == "L" .AND. lSecure
IF HB_ISLOGICAL( lSecure ) .AND. lSecure
cStr += "; secure"
ENDIF

12
harbour/extras/httpsrv/session.prg
View File

@@ -737,18 +737,18 @@ STATIC FUNCTION TimeDiffAsSeconds( dDateStart, dDateEnd, cTimeStart, cTimeEnd )
STATIC FUNCTION FT_ELAPSED(dStart, dEnd, cTimeStart, cTimeEnd)
LOCAL nTotalSec, nCtr, nConstant, nTemp, aRetVal[4,2]
IF ! ( VALTYPE(dStart) $ 'DC' )
dStart := DATE()
ELSEIF VALTYPE(dStart) == 'C'
IF HB_ISSTRING( dStart )
cTimeStart := dStart
dStart := DATE()
ELSEIF ! HB_ISDATE( dStart )
dStart := DATE()
ENDIF
IF ! ( VALTYPE(dEnd) $ 'DC' )
dEnd := DATE()
ELSEIF VALTYPE(dEnd) == 'C'
IF HB_ISSTRING( dEnd )
cTimeEnd := dEnd
dEnd := DATE()
ELSEIF ! HB_ISDATE( dEnd )
dEnd := DATE()
ENDIF
iif( ! HB_ISSTRING(cTimeStart), cTimeStart := '00:00:00', )

11
harbour/extras/httpsrv/uhttpd.prg
View File

@@ -1820,11 +1820,12 @@ FUNCTION uhttpd_join( cSeparator, aData )
FOR nI := 1 TO LEN( aData )
IF nI > 1; cRet += cSeparator
ENDIF
IF VALTYPE(aData[ nI ]) $ "CM"; cRet += aData[ nI ]
ELSEIF VALTYPE(aData[ nI ]) == "N"; cRet += LTRIM(STR(aData[ nI ]))
ELSEIF VALTYPE(aData[ nI ]) == "D"; cRet += iif(!EMPTY(aData[ nI ]), DTOC(aData[ nI ]), "")
ELSE
ENDIF
SWITCH VALTYPE( aData[ nI ] )
CASE "C"
CASE "M"; cRet += aData[ nI ]; EXIT
CASE "N"; cRet += LTRIM(STR(aData[ nI ])); EXIT
CASE "D"; cRet += iif(!EMPTY(aData[ nI ]), DTOC(aData[ nI ]), ""); EXIT
ENDSWITCH
NEXT
RETURN cRet