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

2012-11-07 04:18 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* extras/httpsrv/cgifunc.prg
  * extras/httpsrv/modules/tableservletdb.prg
  * extras/httpsrv/session.prg
  * extras/httpsrv/uhttpd.hbp
  * extras/httpsrv/uhttpd.prg
  * extras/httpsrv/uhttpdgd.hbp
  * extras/rddado/adordd.prg
    * formatted
    ! some commented code converted to #if 0/#endif block
This commit is contained in:
Viktor Szakats
2012-11-07 03:19:49 +00:00
parent 6d60145620
commit 2c4d86c392
8 changed files with 91 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -16,6 +16,17 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-11-07 04:18 UTC+0100 Viktor Szakats (harbour syenar.net)
* extras/httpsrv/cgifunc.prg
* extras/httpsrv/modules/tableservletdb.prg
* extras/httpsrv/session.prg
* extras/httpsrv/uhttpd.hbp
* extras/httpsrv/uhttpd.prg
* extras/httpsrv/uhttpdgd.hbp
* extras/rddado/adordd.prg
* formatted
! some commented code converted to #if 0/#endif block
2012-11-07 03:28 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbnf/hbnf.hbx
* contrib/hbodbc/hbodbc.hbx

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

@@ -473,7 +473,7 @@ FUNCTION uhttpd_TimeDiffAsSeconds( dDateStart, dDateEnd, cTimeStart, cTimeEnd )
__defaultNIL( @dDateEnd, Date() )
__defaultNIL( @cTimeEnd, Time() )
aRetVal := FT_ELAPSED( dDateStart, dDateEnd, cTimeStart, cTimeEnd )
aRetVal := ft_Elapsed( dDateStart, dDateEnd, cTimeStart, cTimeEnd )
RETURN aRetVal[ 4, 2 ]
@@ -497,8 +497,8 @@ FUNCTION uhttpd_OutputString( cString, aTranslate, lProtected )
FUNCTION uhttpd_HtmlSpecialChars( cString, cQuote_style )
LOCAL aTranslations := { ;
{ '&', '&' },;
{ '<', '&lt;' },;
{ '&', '&amp;' }, ;
{ '<', '&lt;' }, ;
{ '>', '&gt;' } ;
}
@@ -693,50 +693,6 @@ PROCEDURE uhttpd_Die( cError )
FUNCTION uhttpd_HTMLSpace( n )
RETURN Replicate( "&nbsp;", n ) // "&#32;"
/* FROM FT LIB */
STATIC FUNCTION FT_ELAPSED( dStart, dEnd, cTimeStart, cTimeEnd )
LOCAL nTotalSec, nCtr, nConstant, nTemp, aRetVal[ 4, 2 ]
IF HB_ISSTRING( dStart )
cTimeStart := dStart
dStart := Date()
ELSEIF ! HB_ISDATE( dStart )
dStart := Date()
ENDIF
IF HB_ISSTRING( dEnd )
cTimeEnd := dEnd
dEnd := Date()
ELSEIF ! HB_ISDATE( dEnd )
dEnd := Date()
ENDIF
iif( ! HB_ISSTRING( cTimeStart ), cTimeStart := '00:00:00', )
iif( ! HB_ISSTRING( cTimeEnd ), cTimeEnd := '00:00:00', )
nTotalSec := ;
( dEnd - dStart ) * 86400 + ;
Val( cTimeEnd ) * 3600 + ;
Val( SubStr( cTimeEnd, At( ':', cTimeEnd ) + 1, 2 ) ) * 60 + ;
iif( RAt( ':', cTimeEnd ) == At( ':', cTimeEnd ), 0, ;
Val( SubStr( cTimeEnd, RAt( ':', cTimeEnd ) + 1 ) ) ) - ;
Val( cTimeStart ) * 3600 - ;
Val( SubStr( cTimeStart, At( ':', cTimeStart ) + 1, 2 ) ) * 60 - ;
iif( RAt( ':', cTimeStart ) == At( ':', cTimeStart ), 0, ;
Val( SubStr( cTimeStart, RAt( ':', cTimeStart ) + 1 ) ) )
nTemp := nTotalSec
FOR nCtr := 1 TO 4
nConstant := iif( nCtr == 1, 86400, iif( nCtr == 2, 3600, iif( nCtr == 3, 60, 1 ) ) )
aRetVal[ nCtr, 1 ] := Int( nTemp / nConstant )
aRetval[ nCtr, 2 ] := nTotalSec / nConstant
nTemp -= aRetVal[ nCtr, 1 ] * nConstant
NEXT
RETURN aRetVal
PROCEDURE uhttpd_WriteToLogFile( cString, cLog, lCreate )
LOCAL nHandle, cSep
@@ -777,13 +733,13 @@ FUNCTION uhttpd_SplitFileName( cFile )
hb_FNameSplit( cFile, @cPath, @cName, @cExt, @cDrive )
hFile := { ;
"FILE" => cFile,;
"DRIVE" => cDrive,;
"PATH" => cPath,;
"NAME" => cName,;
"EXT" => cExt,;
"FULLPATH" => NIL,;
"FULLNAME" => cName + cExt,;
"FILE" => cFile, ;
"DRIVE" => cDrive, ;
"PATH" => cPath, ;
"NAME" => cName, ;
"EXT" => cExt, ;
"FULLPATH" => NIL, ;
"FULLNAME" => cName + cExt, ;
"UNC" => NIL ;
}

8
harbour/extras/httpsrv/modules/tableservletdb.prg
View File

@@ -368,9 +368,11 @@ METHOD xmlEncode( input ) CLASS TableManager
CASE '>'
out += "&gt;"
EXIT
// CASE ' '
// out += "&nbsp;"
// EXIT
#if 0
CASE ' '
out += "&nbsp;"
EXIT
#endif
CASE Chr( 9 ) // E'\t'
CASE Chr( 13 ) // E'\r'
CASE Chr( 10 ) // E'\n'

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

@@ -779,55 +779,10 @@ STATIC FUNCTION TimeDiffAsSeconds( dDateStart, dDateEnd, cTimeStart, cTimeEnd )
__defaultNIL( @dDateEnd, Date() )
__defaultNIL( @cTimeEnd, Time() )
aRetVal := FT_ELAPSED( dDateStart, dDateEnd, cTimeStart, cTimeEnd )
aRetVal := ft_Elapsed( dDateStart, dDateEnd, cTimeStart, cTimeEnd )
RETURN aRetVal[ 4, 2 ]
// Nanforum ELAPSED
STATIC FUNCTION FT_ELAPSED( dStart, dEnd, cTimeStart, cTimeEnd )
LOCAL nTotalSec, nCtr, nConstant, nTemp, aRetVal[ 4, 2 ]
IF HB_ISSTRING( dStart )
cTimeStart := dStart
dStart := Date()
ELSEIF ! HB_ISDATE( dStart )
dStart := Date()
ENDIF
IF HB_ISSTRING( dEnd )
cTimeEnd := dEnd
dEnd := Date()
ELSEIF ! HB_ISDATE( dEnd )
dEnd := Date()
ENDIF
iif( ! HB_ISSTRING( cTimeStart ), cTimeStart := '00:00:00', )
iif( ! HB_ISSTRING( cTimeEnd ), cTimeEnd := '00:00:00', )
nTotalSec := ;
( dEnd - dStart ) * 86400 + ;
Val( cTimeEnd ) * 3600 + ;
Val( SubStr( cTimeEnd, At( ':', cTimeEnd ) + 1, 2 ) ) * 60 + ;
iif( RAt( ':', cTimeEnd ) == At( ':', cTimeEnd ), 0, ;
Val( SubStr( cTimeEnd, RAt( ':', cTimeEnd ) + 1 ) ) ) - ;
Val( cTimeStart ) * 3600 - ;
Val( SubStr( cTimeStart, At( ':', cTimeStart ) + 1, 2 ) ) * 60 - ;
iif( RAt( ':', cTimeStart ) == At( ':', cTimeStart ), 0, ;
Val( SubStr( cTimeStart, RAt( ':', cTimeStart ) + 1 ) ) )
nTemp := nTotalSec
FOR nCtr := 1 TO 4
nConstant := iif( nCtr == 1, 86400, iif( nCtr == 2, 3600, iif( nCtr == 3, 60, 1 ) ) )
aRetVal[ nCtr, 1 ] := Int( nTemp / nConstant )
aRetval[ nCtr, 2 ] := nTotalSec / nConstant
nTemp -= aRetVal[ nCtr, 1 ] * nConstant
NEXT
RETURN aRetVal
// ------------------------------
METHOD Encode() CLASS uhttpd_Session

3
harbour/extras/httpsrv/uhttpd.hbp
View File

@@ -4,4 +4,5 @@
-mt -gui uhttpd.prg cgifunc.prg cookie.prg session.prg
-l{win}hbwin
hbwin.hbc
hbnf.hbc

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

@@ -569,7 +569,7 @@ PROCEDURE Main( ... )
#ifdef __PLATFORM__WINDOWS
// windows resource releasing - 1 millisecond wait
IF WIN_SYSREFRESH( 1 ) != 0
IF win_SysRefresh( 1 ) != 0
EXIT
ENDIF
#endif
@@ -694,7 +694,7 @@ STATIC FUNCTION AcceptConnections()
#ifdef __PLATFORM__WINDOWS
// releasing resources
IF WIN_SYSREFRESH( 1 ) != 0
IF win_SysRefresh( 1 ) != 0
lQuitRequest := .T.
ENDIF
#endif
@@ -849,7 +849,7 @@ STATIC FUNCTION ProcessConnection()
#ifdef __PLATFORM__WINDOWS
// releasing resources
IF WIN_SYSREFRESH( 1 ) != 0
IF win_SysRefresh( 1 ) != 0
lQuitRequest := .T.
EXIT
ENDIF
@@ -1010,7 +1010,7 @@ STATIC FUNCTION ServiceConnection()
#ifdef __PLATFORM__WINDOWS
// releasing resources
IF WIN_SYSREFRESH( 1 ) != 0
IF win_SysRefresh( 1 ) != 0
lQuitRequest := .T.
EXIT
ENDIF
@@ -2838,49 +2838,49 @@ STATIC FUNCTION LoadMimeTypes()
// TODO: load mime types from file
RETURN { ;
"css" => "text/css",;
"htm" => "text/html",;
"html" => "text/html",;
"txt" => "text/plain",;
"text" => "text/plain",;
"asc" => "text/plain",;
"c" => "text/plain",;
"h" => "text/plain",;
"cpp" => "text/plain",;
"hpp" => "text/plain",;
"log" => "text/plain",;
"rtf" => "text/rtf",;
"xml" => "text/xml",;
"xsl" => "text/xsl",;
"bmp" => "image/bmp",;
"gif" => "image/gif",;
"jpg" => "image/jpeg",;
"jpe" => "image/jpeg",;
"jpeg" => "image/jpeg",;
"png" => "image/png",;
"tif" => "image/tiff",;
"tiff" => "image/tiff",;
"djv" => "image/vnd.djvu",;
"djvu" => "image/vnd.djvu",;
"ico" => "image/x-icon",;
"xls" => "application/excel",;
"doc" => "application/msword",;
"pdf" => "application/pdf",;
"ps" => "application/postscript",;
"eps" => "application/postscript",;
"ppt" => "application/powerpoint",;
"bz2" => "application/x-bzip2",;
"gz" => "application/x-gzip",;
"tgz" => "application/x-gtar",;
"js" => "application/x-javascript",;
"tar" => "application/x-tar",;
"tex" => "application/x-tex",;
"zip" => "application/zip",;
"midi" => "audio/midi",;
"mp3" => "audio/mpeg",;
"wav" => "audio/x-wav",;
"qt" => "video/quicktime",;
"mov" => "video/quicktime",;
"css" => "text/css", ;
"htm" => "text/html", ;
"html" => "text/html", ;
"txt" => "text/plain", ;
"text" => "text/plain", ;
"asc" => "text/plain", ;
"c" => "text/plain", ;
"h" => "text/plain", ;
"cpp" => "text/plain", ;
"hpp" => "text/plain", ;
"log" => "text/plain", ;
"rtf" => "text/rtf", ;
"xml" => "text/xml", ;
"xsl" => "text/xsl", ;
"bmp" => "image/bmp", ;
"gif" => "image/gif", ;
"jpg" => "image/jpeg", ;
"jpe" => "image/jpeg", ;
"jpeg" => "image/jpeg", ;
"png" => "image/png", ;
"tif" => "image/tiff", ;
"tiff" => "image/tiff", ;
"djv" => "image/vnd.djvu", ;
"djvu" => "image/vnd.djvu", ;
"ico" => "image/x-icon", ;
"xls" => "application/excel", ;
"doc" => "application/msword", ;
"pdf" => "application/pdf", ;
"ps" => "application/postscript", ;
"eps" => "application/postscript", ;
"ppt" => "application/powerpoint", ;
"bz2" => "application/x-bzip2", ;
"gz" => "application/x-gzip", ;
"tgz" => "application/x-gtar", ;
"js" => "application/x-javascript", ;
"tar" => "application/x-tar", ;
"tex" => "application/x-tex", ;
"zip" => "application/zip", ;
"midi" => "audio/midi", ;
"mp3" => "audio/mpeg", ;
"wav" => "audio/x-wav", ;
"qt" => "video/quicktime", ;
"mov" => "video/quicktime", ;
"avi" => "video/x-msvideo" }
STATIC FUNCTION GT_notifier( nEvent, xParams )

2
harbour/extras/httpsrv/uhttpdgd.hbp
View File

@@ -3,5 +3,5 @@
#
@uhttpd.hbp
hbgd.hbc -DGD_SUPPORT
hbct.hbc

24
harbour/extras/rddado/adordd.prg
View File

@@ -144,8 +144,8 @@ STATIC FUNCTION ADO_CREATE( nWA, aOpenInfo )
LOCAL cUserName := hb_tokenGet( aOpenInfo[ UR_OI_NAME ], 5, ";" )
LOCAL cPassword := hb_tokenGet( aOpenInfo[ UR_OI_NAME ], 6, ";" )
LOCAL oConnection := win_OleCreateObject( "ADODB.Connection" )
LOCAL oCatalog := win_OleCreateObject( "ADOX.Catalog" )
LOCAL oConnection := win_oleCreateObject( "ADODB.Connection" )
LOCAL oCatalog := win_oleCreateObject( "ADOX.Catalog" )
LOCAL aWAData := USRRDD_AREADATA( nWA )
LOCAL oError, n
@@ -279,7 +279,7 @@ STATIC FUNCTION ADO_OPEN( nWA, aOpenInfo )
ENDIF
IF Empty( aOpenInfo[ UR_OI_CONNECT ] )
aWAData[ WA_CONNECTION ] := win_OleCreateObject( "ADODB.Connection" )
aWAData[ WA_CONNECTION ] := win_oleCreateObject( "ADODB.Connection" )
aWAData[ WA_TABLENAME ] := t_cTableName
aWAData[ WA_QUERY ] := t_cQuery
aWAData[ WA_USERNAME ] := t_cUserName
@@ -335,7 +335,7 @@ STATIC FUNCTION ADO_OPEN( nWA, aOpenInfo )
";DbName=" + aOpenInfo[ UR_OI_NAME ] )
ENDCASE
ELSE
aWAData[ WA_CONNECTION ] := win_OleAuto()
aWAData[ WA_CONNECTION ] := win_oleAuto()
aWAData[ WA_CONNECTION ]:__hObj := aOpenInfo[ UR_OI_CONNECT ] /* "ADODB.Connection" */
aWAData[ WA_TABLENAME ] := t_cTableName
aWAData[ WA_QUERY ] := t_cQuery
@@ -353,7 +353,7 @@ STATIC FUNCTION ADO_OPEN( nWA, aOpenInfo )
aWAData[ WA_QUERY ] := "SELECT * FROM "
ENDIF
oRecordSet := win_OleCreateObject( "ADODB.Recordset" )
oRecordSet := win_oleCreateObject( "ADODB.Recordset" )
IF oRecordSet == NIL
oError := ErrorNew()
@@ -377,7 +377,7 @@ STATIC FUNCTION ADO_OPEN( nWA, aOpenInfo )
ENDIF
BEGIN SEQUENCE WITH {| oErr | Break( oErr ) }
aWAData[ WA_CATALOG ] := win_OleCreateObject( "ADOX.Catalog" )
aWAData[ WA_CATALOG ] := win_oleCreateObject( "ADOX.Catalog" )
aWAData[ WA_CATALOG ]:ActiveConnection := aWAData[ WA_CONNECTION ]
RECOVER
END SEQUENCE
@@ -1158,7 +1158,7 @@ STATIC FUNCTION ADO_ORDCREATE( nWA, aOrderCreateInfo )
BEGIN SEQUENCE WITH {| oErr | Break( oErr ) }
IF aWAData[ WA_CATALOG ]:Tables( aWAData[ WA_TABLENAME ] ):Indexes == NIL .OR. ! lFound
oIndex := win_OleCreateObject( "ADOX.Index" )
oIndex := win_oleCreateObject( "ADOX.Index" )
oIndex:Name := iif( ! Empty( aOrderCreateInfo[ UR_ORCR_TAGNAME ] ), aOrderCreateInfo[ UR_ORCR_TAGNAME ], aOrderCreateInfo[ UR_ORCR_CKEY ] )
oIndex:PrimaryKey := .F.
oIndex:Unique := aOrderCreateInfo[ UR_ORCR_UNIQUE ]
@@ -1213,7 +1213,8 @@ STATIC FUNCTION ADO_EVALBLOCK( nArea, bBlock, uResult )
RETURN HB_SUCCESS
STATIC FUNCTION ADO_EXISTS( nRdd, cTable, cIndex, ulConnect )
// LOCAL n
// LOCAL n
LOCAL lRet := HB_FAILURE
LOCAL aRData := USRRDD_RDDDATA( nRDD )
@@ -1237,7 +1238,8 @@ STATIC FUNCTION ADO_EXISTS( nRdd, cTable, cIndex, ulConnect )
RETURN lRet
STATIC FUNCTION ADO_DROP( nRdd, cTable, cIndex, ulConnect )
// LOCAL n
// LOCAL n
LOCAL lRet := HB_FAILURE
LOCAL aRData := USRRDD_RDDDATA( nRDD )
@@ -1491,7 +1493,9 @@ STATIC FUNCTION ADO_GETFIELDTYPE( nADOFieldType )
CASE nADOFieldType == adChapter
CASE nADOFieldType == adVarNumeric
/* CASE nADOFieldType == adArray */
#if 0
CASE nADOFieldType == adArray
#endif
CASE nADOFieldType == adBoolean
nDBFFieldType := HB_FT_LOGICAL