- extras/guestbk/cgi.ch
- extras/guestbk/guestbk.hbp
- extras/guestbk/guestbk.txt
* .gitattributes
* contrib/hbgd/tests/counter.prg
* contrib/hbhttpd/core.prg
* contrib/hbgd/tests/digits/57chevy.gif -> contrib/hbgd/tests/imgs_in/57chevy.gif
* contrib/hbgd/tests/digits/7seg.gif -> contrib/hbgd/tests/imgs_in/7seg.gif
* contrib/hbgd/tests/digits/brsd.gif -> contrib/hbgd/tests/imgs_in/brsd.gif
* contrib/hbgd/tests/digits/digib.gif -> contrib/hbgd/tests/imgs_in/digib.gif
* contrib/hbgd/tests/digits/fdb.gif -> contrib/hbgd/tests/imgs_in/fdb.gif
* contrib/hbgd/tests/digits/jelly.gif -> contrib/hbgd/tests/imgs_in/jelly.gif
* contrib/hbgd/tests/digits/odb.gif -> contrib/hbgd/tests/imgs_in/odb.gif
* contrib/hbgd/tests/digits/odw.gif -> contrib/hbgd/tests/imgs_in/odw.gif
* contrib/hbgd/tests/digits/pdg.gif -> contrib/hbgd/tests/imgs_in/pdg.gif
* contrib/hbgd/tests/digits/pdw.gif -> contrib/hbgd/tests/imgs_in/pdw.gif
* contrib/hbhttpd/tests/tpl/_main.tpl -> contrib/hbhttpd/tests/tpl/_main.html
* contrib/hbhttpd/tests/tpl/app/account/edit.tpl -> contrib/hbhttpd/tests/tpl/app/account/edit.html
* contrib/hbhttpd/tests/tpl/app/account.tpl -> contrib/hbhttpd/tests/tpl/app/account.html
* contrib/hbhttpd/tests/tpl/app/cart.tpl -> contrib/hbhttpd/tests/tpl/app/cart.html
* contrib/hbhttpd/tests/tpl/app/login.tpl -> contrib/hbhttpd/tests/tpl/app/login.html
* contrib/hbhttpd/tests/tpl/app/logout.tpl -> contrib/hbhttpd/tests/tpl/app/logout.html
* contrib/hbhttpd/tests/tpl/app/main.tpl -> contrib/hbhttpd/tests/tpl/app/main.html
* contrib/hbhttpd/tests/tpl/app/register.tpl -> contrib/hbhttpd/tests/tpl/app/register.html
* contrib/hbhttpd/tests/tpl/app/shopping.tpl -> contrib/hbhttpd/tests/tpl/app/shopping.html
* extras/gtwvw/docs/funclist.txt -> contrib/gtwvw/doc/funclist.txt
* extras/gtwvw/docs/gtwvw.txt -> contrib/gtwvw/doc/gtwvw.txt
* extras/gtwvw/docs/whatsnew.txt -> contrib/gtwvw/doc/ChangeLog.txt
* extras/gtwvw/gtwvw.hbc -> contrib/gtwvw/gtwvw.hbc
* extras/gtwvw/gtwvw.hbx -> contrib/gtwvw/gtwvw.hbx
* extras/gtwvw/gtwvwd.c -> contrib/gtwvw/gtwvwd.c
* extras/gtwvw/hbgtwvw.h -> contrib/gtwvw/hbgtwvw.h
* extras/gtwvw/hbole.h -> contrib/gtwvw/hbole.h
* extras/gtwvw/tests/_wvwmous.prg -> contrib/gtwvw/tests/_wvwmous.prg
* extras/gtwvw/tests/def2.bmp -> contrib/gtwvw/tests/def2.bmp
* extras/gtwvw/tests/dia_excl.ico -> contrib/gtwvw/tests/dia_excl.ico
* extras/gtwvw/tests/drawimg.prg -> contrib/gtwvw/tests/drawimg.prg
* extras/gtwvw/tests/ebtest7.prg -> contrib/gtwvw/tests/eb7.prg
* extras/gtwvw/tests/hbmk.hbm -> contrib/gtwvw/tests/hbmk.hbm
* extras/gtwvw/tests/vouch1.bmp -> contrib/gtwvw/tests/vouch1.bmp
* extras/gtwvw/tests/vouch1.gif -> contrib/gtwvw/tests/vouch1.gif
* extras/gtwvw/wvt2wvw.ch -> contrib/gtwvw/wvt2wvw.ch
* extras/gtwvw/wvwcheck.c -> contrib/gtwvw/checkbox.c
* extras/gtwvw/wvwdraw.c -> contrib/gtwvw/wvwdraw.c
* extras/gtwvw/wvwedit.c -> contrib/gtwvw/editbox.c
* extras/gtwvw/wvwfuncs.c -> contrib/gtwvw/wvwutils.c
* extras/gtwvw/wvwmenu.c -> contrib/gtwvw/menubar.c
* extras/gtwvw/wvwpush.c -> contrib/gtwvw/pushbut.c
* extras/gtwvw/wvwstbar.c -> contrib/gtwvw/statbar.c
* extras/gtwvw/wvwtbar.c -> contrib/gtwvw/toolbar.c
* extras/guestbk/guestbk.html -> tests/guestbk.html
* extras/hbdoc/hbdoc.css -> contrib/hbdoc/hbdoc.css
* extras/gtwvw/gtwvw.hbp -> contrib/gtwvw/gtwvw.hbp
* extras/gtwvw/tests/cbtest1.prg -> contrib/gtwvw/tests/cb1.prg
* extras/gtwvw/tests/cbtest6.prg -> contrib/gtwvw/tests/cb6.prg
* extras/gtwvw/tests/inpfocus.prg -> contrib/gtwvw/tests/inpfocus.prg
* extras/gtwvw/tests/maincoor.prg -> contrib/gtwvw/tests/maincoor.prg
* extras/gtwvw/tests/maximize.prg -> contrib/gtwvw/tests/maximize.prg
* extras/gtwvw/tests/prog0.prg -> contrib/gtwvw/tests/prog0.prg
* extras/gtwvw/tests/prog1.prg -> contrib/gtwvw/tests/prog1.prg
* extras/gtwvw/tests/prog2.prg -> contrib/gtwvw/tests/prog2.prg
* extras/gtwvw/tests/readme.txt -> contrib/gtwvw/tests/readme.txt
* extras/gtwvw/tests/wvwtest9.prg -> contrib/gtwvw/tests/demo.prg
* extras/guestbk/_cgi.prg -> tests/cgi.prg
* extras/guestbk/_inifile.prg -> tests/inifile.prg
* extras/guestbk/guestbk.ini -> tests/guestbk.ini
* extras/guestbk/guestbk.prg -> tests/guestbk.prg
* extras/hbdoc/_genbase.prg -> contrib/hbdoc/_base.prg
* extras/hbdoc/_genhtml.prg -> contrib/hbdoc/_html.prg
* extras/hbdoc/_gentxt.prg -> contrib/hbdoc/_txt.prg
* extras/hbdoc/_genxml.prg -> contrib/hbdoc/_xml.prg
* extras/hbdoc/hbdoc.hbp -> contrib/hbdoc/hbdoc.hbp
* extras/hbdoc/hbdoc.prg -> contrib/hbdoc/hbdoc.prg
* more file/dir rename sync with 3.4 fork, plus some related file content
341 lines
10 KiB
Plaintext
341 lines
10 KiB
Plaintext
/*
|
|
* Copyright (C) 1999 Matthew Hamilton
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; see the file LICENSE.txt. If not, write to
|
|
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA (or visit https://www.gnu.org/licenses/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
#include "fileio.ch"
|
|
#include "hbclass.ch"
|
|
|
|
CREATE CLASS TIniFile
|
|
|
|
VAR FileName
|
|
VAR Contents
|
|
|
|
METHOD New( cFileName )
|
|
METHOD ReadString( cSection, cIdent, cDefault )
|
|
METHOD WriteString( cSection, cIdent, cString )
|
|
METHOD ReadNumber( cSection, cIdent, nDefault )
|
|
METHOD WriteNumber( cSection, cIdent, nNumber )
|
|
METHOD ReadDate( cSection, cIdent, dDefault )
|
|
METHOD WriteDate( cSection, cIdent, dDate )
|
|
METHOD ReadBool( cSection, cIdent, lDefault )
|
|
METHOD WriteBool( cSection, cIdent, lBool )
|
|
METHOD DeleteKey( cSection, cIdent )
|
|
METHOD EraseSection( cSection )
|
|
METHOD ReadSection( cSection )
|
|
METHOD ReadSections()
|
|
METHOD UpdateFile()
|
|
|
|
END CLASS
|
|
|
|
METHOD New( cFileName ) CLASS TIniFile
|
|
|
|
LOCAL lDone, hFile, cFile, cLine, cIdent, nPos
|
|
LOCAL CurrArray
|
|
|
|
IF Empty( cFileName )
|
|
// raise an error?
|
|
OutErr( "No filename passed to TIniFile():New()" )
|
|
RETURN NIL
|
|
|
|
ELSE
|
|
::FileName := cFilename
|
|
::Contents := {}
|
|
CurrArray := ::Contents
|
|
|
|
IF hb_FileExists( cFileName )
|
|
hFile := FOpen( cFilename, FO_READ )
|
|
ELSE
|
|
hFile := FCreate( cFilename )
|
|
ENDIF
|
|
|
|
cLine := ""
|
|
lDone := .F.
|
|
DO WHILE ! lDone
|
|
cFile := Space( 256 )
|
|
lDone := ( FRead( hFile, @cFile, 256 ) <= 0 )
|
|
|
|
cFile := StrTran( cFile, Chr( 13 ) ) // so we can just search for Chr( 10 )
|
|
|
|
// prepend last read
|
|
cFile := cLine + cFile
|
|
DO WHILE ! Empty( cFile )
|
|
IF ( nPos := At( Chr( 10 ), cFile ) ) > 0
|
|
cLine := Left( cFile, nPos - 1 )
|
|
cFile := SubStr( cFile, nPos + 1 )
|
|
|
|
IF ! Empty( cLine )
|
|
DO CASE
|
|
CASE Left( cLine, 1 ) == "[" // new section
|
|
IF ( nPos := At( "]", cLine ) ) > 1
|
|
cLine := SubStr( cLine, 2, nPos - 2 )
|
|
ELSE
|
|
cLine := SubStr( cLine, 2 )
|
|
ENDIF
|
|
|
|
AAdd( ::Contents, { cLine, { /* this will be CurrArray */ } } )
|
|
CurrArray := ::Contents[ Len( ::Contents ) ][ 2 ]
|
|
|
|
CASE Left( cLine, 1 ) == ";" // preserve comments
|
|
AAdd( CurrArray, { NIL, cLine } )
|
|
|
|
OTHERWISE
|
|
IF ( nPos := At( "=", cLine ) ) > 0
|
|
cIdent := Left( cLine, nPos - 1 )
|
|
cLine := SubStr( cLine, nPos + 1 )
|
|
|
|
AAdd( CurrArray, { cIdent, cLine } )
|
|
|
|
ELSE
|
|
AAdd( CurrArray, { cLine, "" } )
|
|
ENDIF
|
|
ENDCASE
|
|
cLine := "" // to stop prepend later on
|
|
ENDIF
|
|
ELSE
|
|
cLine := cFile
|
|
cFile := ""
|
|
ENDIF
|
|
ENDDO
|
|
ENDDO
|
|
|
|
FClose( hFile )
|
|
ENDIF
|
|
|
|
RETURN Self
|
|
|
|
METHOD ReadString( cSection, cIdent, cDefault ) CLASS TIniFile
|
|
|
|
LOCAL cResult := cDefault
|
|
LOCAL i, j, cFind
|
|
|
|
IF Empty( cSection )
|
|
cFind := Lower( cIdent )
|
|
j := AScan( ::Contents, {| x | HB_ISSTRING( x[ 1 ] ) .AND. Lower( x[ 1 ] ) == cFind .AND. HB_ISSTRING( x[ 2 ] ) } )
|
|
|
|
IF j > 0
|
|
cResult := ::Contents[ j ][ 2 ]
|
|
ENDIF
|
|
|
|
ELSE
|
|
cFind := Lower( cSection )
|
|
i := AScan( ::Contents, {| x | HB_ISSTRING( x[ 1 ] ) .AND. Lower( x[ 1 ] ) == cFind } )
|
|
|
|
IF i > 0
|
|
cFind := Lower( cIdent )
|
|
j := AScan( ::Contents[ i ][ 2 ], {| x | HB_ISSTRING( x[ 1 ] ) .AND. Lower( x[ 1 ] ) == cFind } )
|
|
|
|
IF j > 0
|
|
cResult := ::Contents[ i ][ 2 ][ j ][ 2 ]
|
|
ENDIF
|
|
ENDIF
|
|
ENDIF
|
|
|
|
RETURN cResult
|
|
|
|
METHOD PROCEDURE WriteString( cSection, cIdent, cString ) CLASS TIniFile
|
|
|
|
LOCAL i, j, cFind
|
|
|
|
IF Empty( cIdent )
|
|
OutErr( "Must specify an identifier" )
|
|
|
|
ELSEIF Empty( cSection )
|
|
cFind := Lower( cIdent )
|
|
j := AScan( ::Contents, {| x | HB_ISSTRING( x[ 1 ] ) .AND. Lower( x[ 1 ] ) == cFind .AND. HB_ISSTRING( x[ 2 ] ) } )
|
|
|
|
IF j > 0
|
|
::Contents[ j ][ 2 ] := cString
|
|
ELSE
|
|
AAdd( ::Contents, NIL )
|
|
AIns( ::Contents, 1 )
|
|
::Contents[ 1 ] := { cIdent, cString }
|
|
ENDIF
|
|
|
|
ELSE
|
|
cFind := Lower( cSection )
|
|
IF ( i := AScan( ::Contents, {| x | HB_ISSTRING( x[ 1 ] ) .AND. Lower( x[ 1 ] ) == cFind .AND. HB_ISARRAY( x[ 2 ] ) } ) ) > 0
|
|
cFind := Lower( cIdent )
|
|
j := AScan( ::Contents[ i ][ 2 ], {| x | HB_ISSTRING( x[ 1 ] ) .AND. Lower( x[ 1 ] ) == cFind } )
|
|
|
|
IF j > 0
|
|
::Contents[ i ][ 2 ][ j ][ 2 ] := cString
|
|
ELSE
|
|
AAdd( ::Contents[ i ][ 2 ], { cIdent, cString } )
|
|
ENDIF
|
|
ELSE
|
|
AAdd( ::Contents, { cSection, { { cIdent, cString } } } )
|
|
ENDIF
|
|
ENDIF
|
|
|
|
RETURN
|
|
|
|
METHOD ReadNumber( cSection, cIdent, nDefault ) CLASS TIniFile
|
|
RETURN Val( ::ReadString( cSection, cIdent, Str( nDefault ) ) )
|
|
|
|
METHOD PROCEDURE WriteNumber( cSection, cIdent, nNumber ) CLASS TIniFile
|
|
|
|
::WriteString( cSection, cIdent, hb_ntos( nNumber ) )
|
|
|
|
RETURN
|
|
|
|
METHOD ReadDate( cSection, cIdent, dDefault ) CLASS TIniFile
|
|
RETURN hb_SToD( ::ReadString( cSection, cIdent, DToS( dDefault ) ) )
|
|
|
|
METHOD PROCEDURE WriteDate( cSection, cIdent, dDate ) CLASS TIniFile
|
|
|
|
::WriteString( cSection, cIdent, DToS( dDate ) )
|
|
|
|
RETURN
|
|
|
|
METHOD ReadBool( cSection, cIdent, lDefault ) CLASS TIniFile
|
|
|
|
LOCAL cDefault := iif( lDefault, ".T.", ".F." )
|
|
|
|
RETURN ::ReadString( cSection, cIdent, cDefault ) == ".T."
|
|
|
|
METHOD PROCEDURE WriteBool( cSection, cIdent, lBool ) CLASS TIniFile
|
|
|
|
::WriteString( cSection, cIdent, iif( lBool, ".T.", ".F." ) )
|
|
|
|
RETURN
|
|
|
|
METHOD PROCEDURE DeleteKey( cSection, cIdent ) CLASS TIniFile
|
|
|
|
LOCAL i, j
|
|
|
|
cSection := Lower( cSection )
|
|
i := AScan( ::Contents, {| x | HB_ISSTRING( x[ 1 ] ) .AND. Lower( x[ 1 ] ) == cSection } )
|
|
|
|
IF i > 0
|
|
cIdent := Lower( cIdent )
|
|
j := AScan( ::Contents[ i ][ 2 ], {| x | HB_ISSTRING( x[ 1 ] ) .AND. Lower( x[ 1 ] ) == cIdent } )
|
|
hb_ADel( ::Contents[ i ][ 2 ], j, .T. )
|
|
ENDIF
|
|
|
|
RETURN
|
|
|
|
METHOD PROCEDURE EraseSection( cSection ) CLASS TIniFile
|
|
|
|
LOCAL i
|
|
|
|
IF Empty( cSection )
|
|
DO WHILE ( i := AScan( ::Contents, {| x | HB_ISSTRING( x[ 1 ] ) .AND. HB_ISSTRING( x[ 2 ] ) } ) ) > 0
|
|
hb_ADel( ::Contents, i, .T. )
|
|
ENDDO
|
|
ELSE
|
|
cSection := Lower( cSection )
|
|
IF ( i := AScan( ::Contents, {| x | HB_ISSTRING( x[ 1 ] ) .AND. Lower( x[ 1 ] ) == cSection .AND. HB_ISARRAY( x[ 2 ] ) } ) ) > 0
|
|
hb_ADel( ::Contents, i, .T. )
|
|
ENDIF
|
|
ENDIF
|
|
|
|
RETURN
|
|
|
|
METHOD ReadSection( cSection ) CLASS TIniFile
|
|
|
|
LOCAL i, j, aSection := {}
|
|
|
|
IF Empty( cSection )
|
|
FOR i := 1 TO Len( ::Contents )
|
|
IF HB_ISSTRING( ::Contents[ i ][ 1 ] ) .AND. HB_ISSTRING( ::Contents[ i ][ 2 ] )
|
|
AAdd( aSection, ::Contents[ i ][ 1 ] )
|
|
ENDIF
|
|
NEXT
|
|
ELSE
|
|
cSection := Lower( cSection )
|
|
IF ( i := AScan( ::Contents, {| x | HB_ISSTRING( x[ 1 ] ) .AND. x[ 1 ] == cSection .AND. HB_ISARRAY( x[ 2 ] ) } ) ) > 0
|
|
|
|
FOR j := 1 TO Len( ::Contents[ i ][ 2 ] )
|
|
IF ::Contents[ i ][ 2 ][ j ][ 1 ] != NIL
|
|
AAdd( aSection, ::Contents[ i ][ 2 ][ j ][ 1 ] )
|
|
ENDIF
|
|
NEXT
|
|
ENDIF
|
|
ENDIF
|
|
|
|
RETURN aSection
|
|
|
|
METHOD ReadSections() CLASS TIniFile
|
|
|
|
LOCAL i, aSections := {}
|
|
|
|
FOR i := 1 TO Len( ::Contents )
|
|
IF HB_ISARRAY( ::Contents[ i ][ 2 ] )
|
|
AAdd( aSections, ::Contents[ i ][ 1 ] )
|
|
ENDIF
|
|
NEXT
|
|
|
|
RETURN aSections
|
|
|
|
METHOD PROCEDURE UpdateFile() CLASS TIniFile
|
|
|
|
LOCAL i, j
|
|
|
|
LOCAL hFile := FCreate( ::Filename )
|
|
|
|
FOR i := 1 TO Len( ::Contents )
|
|
IF ::Contents[ i ][ 1 ] == NIL
|
|
FWrite( hFile, ::Contents[ i ][ 2 ] + hb_eol() )
|
|
|
|
ELSEIF HB_ISARRAY( ::Contents[ i ][ 2 ] )
|
|
FWrite( hFile, "[" + ::Contents[ i ][ 1 ] + "]" + hb_eol() )
|
|
FOR j := 1 TO Len( ::Contents[ i ][ 2 ] )
|
|
|
|
IF ::Contents[ i ][ 2 ][ j ][ 1 ] == NIL
|
|
FWrite( hFile, ::Contents[ i ][ 2 ][ j ][ 2 ] + hb_eol() )
|
|
ELSE
|
|
FWrite( hFile, ::Contents[ i ][ 2 ][ j ][ 1 ] + "=" + ::Contents[ i ][ 2 ][ j ][ 2 ] + hb_eol() )
|
|
ENDIF
|
|
NEXT
|
|
FWrite( hFile, hb_eol() )
|
|
|
|
ELSEIF HB_ISSTRING( ::Contents[ i ][ 2 ] )
|
|
FWrite( hFile, ::Contents[ i ][ 1 ] + "=" + ::Contents[ i ][ 2 ] + hb_eol() )
|
|
|
|
ENDIF
|
|
NEXT
|
|
|
|
FClose( hFile )
|
|
|
|
RETURN
|