* make_vcce.bat
* make_vcce.mak
! Minor corrections (syncing with existing files).
* doc/genhtm.bat
! Minor fix to make it work out of the box.
- Some obsolete stuff removed from it.
* include/hbapiitm.h
* include/hbapi.h
* source/vm/itemapi.c
+ Added hb_itemPutCLConst() which is the same as
hb_itemPutCConst() but the buffer length can be passed.
Same as xhb hb_itemPutCRawStatic().
+ contrib/xhb/hbcompat.h
+ Added C level compatibility header file.
* contrib/win32/w32_ole.c
! hb_itemPutCRawStatic() -> hb_itemPutCLConst()
! Some more xhb API calls changed to Harbour ones.
! TraceLog() -> HB_TRACE()
! HB_ITEM s_OleAuto -> PHB_ITEM s_pOleAuto
TOFIX (new): s_pOleAuto is not freed on app exit.
! Fixed a few more internal accesses by using API
calls.
; NOTE: There are four more complicated problems here
to be solved:
1) hb_stackSetActionRequest() call
2) Passing direct references to HB_ITEM .value
members to external functions.
3) Storing "hidden" information in string ITEMs
prepended after the strings' actual content.
4) Not freeing s_pOleAuto (this var BTW is used in
one static function only)
* source/rtl/hbinet.c
* source/rdd/dbcmd.c
! Changed some xhb C level API calls to Harbour ones.
* contrib/xhb/Makefile
* contrib/freeimage/Makefile
* contrib/apollo/Makefile
* contrib/firebird/Makefile
* contrib/libct/Makefile
* contrib/telepath/Makefile
* contrib/pgsql/Makefile
* contrib/gd/Makefile
* contrib/libnf/Makefile
* contrib/tip/Makefile
* contrib/adordd/Makefile
* contrib/rdd_ads/Makefile
* contrib/btree/Makefile
* contrib/samples/Makefile
* contrib/mysql/Makefile
* contrib/odbc/Makefile
* contrib/pdflib/Makefile
! Added C and Harbour public headers to GNU makefiles.
! Added one missing SVN header.
* contrib/pdflib/pdfhbdoc.ch
* contrib/pdflib/pdf.ch
! Added missing SVN headers.
- contrib/pdflib/pdflib.h
- Removed this file which belongs to the pdflib
package. This package is needed anyway to use
this contrib. (but the contrib is badly broken)
* contrib/pdflib/make_b32.bat
* contrib/pdflib/make_vc.bat
! Minor typo.
* source/rtl/persist.prg
! Prefixed static var name with "s_"
249 lines
7.7 KiB
Plaintext
249 lines
7.7 KiB
Plaintext
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* Class HBPersistent
|
|
*
|
|
* Copyright 2001 Antonio Linares <alinares@fivetech.com>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* 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 software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* 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 "hbclass.ch"
|
|
#include "common.ch"
|
|
|
|
extern HB_STOD
|
|
|
|
CREATE CLASS HBPersistent
|
|
|
|
METHOD CreateNew() INLINE Self
|
|
METHOD LoadFromFile( cFileName ) INLINE ::LoadFromText( MemoRead( cFileName ) )
|
|
METHOD LoadFromText( cObjectText )
|
|
METHOD SaveToText( cObjectName )
|
|
METHOD SaveToFile( cFileName ) INLINE MemoWrit( cFileName, ::SaveToText() )
|
|
|
|
ENDCLASS
|
|
|
|
METHOD LoadFromText( cObjectText ) CLASS HBPersistent
|
|
|
|
local nFrom := 1, cLine, cToken
|
|
local lStart := .t.
|
|
private oSelf
|
|
|
|
if empty( cObjectText )
|
|
return .F.
|
|
endif
|
|
|
|
do while Empty( ExtractLine( cObjectText, @nFrom ) ) // We skip the first empty lines
|
|
enddo
|
|
|
|
do while nFrom <= Len( cObjectText )
|
|
cLine := ExtractLine( cObjectText, @nFrom )
|
|
|
|
do case
|
|
case Upper( LTrim( hb_TokenGet( cLine, 1 ) ) ) == "OBJECT"
|
|
if lStart
|
|
lStart := .f.
|
|
else
|
|
endif
|
|
|
|
case Upper( LTrim( hb_TokenGet( cLine, 1 ) ) ) == "ARRAY"
|
|
cLine := SubStr( cLine, At( "::", cLine ) )
|
|
M->oSelf := Self
|
|
cLine := StrTran( cLine, "::", "oSelf:" )
|
|
cLine := StrTran( cLine, " LEN ", " = Array( " )
|
|
cLine := RTrim( StrTran( cLine, "=", ":=", , 1 ) ) + " )"
|
|
cLine := &( cLine )
|
|
|
|
case Left( cToken := LTrim( hb_TokenGet( cLine, 1, "=" ) ), 2 ) == "::"
|
|
M->oSelf := Self
|
|
cLine := StrTran( cLine, "::", "oSelf:" )
|
|
cLine := StrTran( cLine, "=", ":=", , 1 )
|
|
cLine := &( cLine )
|
|
|
|
endcase
|
|
|
|
enddo
|
|
|
|
return .T.
|
|
|
|
METHOD SaveToText( cObjectName ) CLASS HBPersistent
|
|
|
|
local oNew := &( ::ClassName() + "()" ):CreateNew()
|
|
local aProperties, n, uValue, uNewValue, cObject, cType
|
|
|
|
static s_nIndent := -3
|
|
|
|
DEFAULT cObjectName TO "o" + ::ClassName()
|
|
|
|
s_nIndent += 3
|
|
cObject := iif( s_nIndent > 0, hb_OSNewLine(), "" ) + Space( s_nIndent ) + ;
|
|
"OBJECT " + iif( s_nIndent != 0, "::", "" ) + cObjectName + " AS " + ;
|
|
::ClassName() + hb_OSNewLine()
|
|
|
|
aProperties := __ClsGetProperties( ::ClassH )
|
|
|
|
for n := 1 to Len( aProperties )
|
|
uValue := __objSendMsg( Self, aProperties[ n ] )
|
|
uNewValue := __objSendMsg( oNew, aProperties[ n ] )
|
|
cType := ValType( uValue )
|
|
|
|
if cType != ValType( uNewValue ) .OR. ! uValue == uNewValue
|
|
|
|
do case
|
|
case cType == "A"
|
|
s_nIndent += 3
|
|
cObject += ArrayToText( uValue, aProperties[ n ], s_nIndent )
|
|
s_nIndent -= 3
|
|
if n < Len( aProperties )
|
|
cObject += hb_OSNewLine()
|
|
endif
|
|
|
|
case cType == "O"
|
|
if __objDerivedFrom( uValue, "HBPERSISTENT" )
|
|
cObject += uValue:SaveToText( aProperties[ n ] )
|
|
endif
|
|
if n < Len( aProperties )
|
|
cObject += hb_OSNewLine()
|
|
endif
|
|
|
|
otherwise
|
|
if n == 1
|
|
cObject += hb_OSNewLine()
|
|
endif
|
|
cObject += Space( s_nIndent ) + " ::" + ;
|
|
aProperties[ n ] + " = " + ValToText( uValue ) + ;
|
|
hb_OSNewLine()
|
|
endcase
|
|
|
|
endif
|
|
|
|
next
|
|
|
|
cObject += hb_OSNewLine() + Space( s_nIndent ) + "ENDOBJECT" + hb_OSNewLine()
|
|
s_nIndent -= 3
|
|
|
|
return cObject
|
|
|
|
static function ArrayToText( aArray, cName, nIndent )
|
|
|
|
local cArray := hb_OSNewLine() + Space( nIndent ) + "ARRAY ::" + cName + ;
|
|
" LEN " + AllTrim( Str( Len( aArray ) ) ) + hb_OSNewLine()
|
|
local n, uValue, cType
|
|
|
|
for n := 1 to Len( aArray )
|
|
uValue := aArray[ n ]
|
|
cType := ValType( uValue )
|
|
|
|
do case
|
|
case cType == "A"
|
|
nIndent += 3
|
|
cArray += ArrayToText( uValue, cName + "[ " + ;
|
|
AllTrim( Str( n ) ) + " ]", nIndent ) + hb_OSNewLine()
|
|
nIndent -= 3
|
|
|
|
case cType == "O"
|
|
if __objDerivedFrom( uValue, "HBPERSISTENT" )
|
|
cArray += uValue:SaveToText( cName + "[ " + AllTrim( Str( n ) ) + ;
|
|
" ]" )
|
|
endif
|
|
|
|
otherwise
|
|
if n == 1
|
|
cArray += hb_OSNewLine()
|
|
endif
|
|
cArray += Space( nIndent ) + " ::" + cName + ;
|
|
+ "[ " + AllTrim( Str( n ) ) + " ]" + " = " + ;
|
|
ValToText( uValue ) + hb_OSNewLine()
|
|
endcase
|
|
next
|
|
|
|
cArray += hb_OSNewLine() + Space( nIndent ) + "ENDARRAY" + hb_OSNewLine()
|
|
|
|
return cArray
|
|
|
|
static function ValToText( uValue )
|
|
|
|
local cType := ValType( uValue )
|
|
local cText
|
|
|
|
do case
|
|
case cType == "C"
|
|
cText := hb_StrToExp( uValue )
|
|
|
|
case cType == "N"
|
|
cText := AllTrim( Str( uValue ) )
|
|
|
|
case cType == "D"
|
|
cText := DToS( uValue )
|
|
cText := "0d" + iif( Empty( cText ), "00000000", cText )
|
|
|
|
otherwise
|
|
cText := hb_ValToStr( uValue )
|
|
endcase
|
|
|
|
return cText
|
|
|
|
// Notice: nFrom must be supplied by reference
|
|
|
|
static function ExtractLine( cText, nFrom )
|
|
|
|
local nAt := hb_At( Chr( 10 ), cText, nFrom )
|
|
|
|
if nAt > 0
|
|
cText := SubStr( cText, nFrom, nAt - nFrom )
|
|
if Right( cText, 1 ) == Chr( 13 )
|
|
cText := hb_StrShrink( cText, 1 )
|
|
endif
|
|
nFrom := nAt + 1
|
|
else
|
|
cText := SubStr( cText, nFrom )
|
|
if Right( cText, 1 ) == Chr( 13 )
|
|
cText := hb_StrShrink( cText, 1 )
|
|
endif
|
|
nFrom += Len( cText ) + 1
|
|
endif
|
|
|
|
return cText
|