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

2012-09-20 11:15 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* harbour/contrib/xhb/txml.prg
    ! xHarbour compatibility patch from Jose F. Gimenez - thanks
This commit is contained in:
Przemyslaw Czerpak
2012-09-20 09:16:09 +00:00
parent f452ee675c
commit 4c47c1e8e4
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -16,6 +16,10 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-09-20 11:15 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* harbour/contrib/xhb/txml.prg
! xHarbour compatibility patch from Jose F. Gimenez - thanks
2012-09-20 00:17 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/gtwvg/crt.prg
! Fixed: regression caused by redirection of "?" command.

34
harbour/contrib/xhb/txml.prg
View File

@@ -340,7 +340,7 @@ CLASS TXmlDocument
METHOD New( xElem, nStyle ) CONSTRUCTOR
METHOD Read( xData, nStyle ) INLINE HBXML_DATAREAD( Self, xData, nStyle )
METHOD ToString( nStyle ) INLINE ::oRoot:ToString( nStyle )
METHOD Write( fHandle, nStyle ) INLINE ::oRoot:Write( fHandle, nStyle )
METHOD Write( fHandle, nStyle )
METHOD FindFirst( cName, cAttrib, cValue, cData )
METHOD FindFirstRegex( cName, cAttrib, cValue, cData )
@@ -349,6 +349,7 @@ CLASS TXmlDocument
METHOD GetContext()
HIDDEN:
DATA oIterator
DATA cHeader
ENDCLASS
@@ -369,7 +370,14 @@ METHOD New( xElem, nStyle ) CLASS TXmlDocument
CASE "N"
CASE "C"
::oRoot := TXmlNode():New( HBXML_TYPE_DOCUMENT )
::Read( xElem, nStyle )
IF hb_fileExists( xElem )
::Read( hb_MemoRead( xElem ), nStyle )
ELSE
::Read( xElem, nStyle )
ENDIF
IF !Empty( ::oRoot:oChild ) .AND. ::oRoot:oChild:cName == "xml"
::cHeader := "<=xml " + ::oRoot:oChild:cData + "?>"
ENDIF
EXIT
ENDSWITCH
@@ -377,6 +385,28 @@ METHOD New( xElem, nStyle ) CLASS TXmlDocument
RETURN Self
METHOD Write( fHandle, nStyle ) CLASS TXmlDocument
LOCAL nResult := HBXML_STATUS_ERROR
IF ValType( fHandle ) == "C" // It's a filename!
fHandle := FCreate( fHandle )
IF fHandle != -1
IF Empty( ::oRoot:oChild ) .OR. !( ::oRoot:oChild:cName == "xml" )
IF Empty( ::cHeader )
FWrite( fHandle, '<?xml version="1.0"?>' + hb_eol() )
ELSE
FWrite( fHandle, ::cHeader + hb_eol() )
ENDIF
ENDIF
nResult := ::oRoot:Write( fHandle, nStyle )
FClose( fHandle )
ENDIF
RETURN nResult
ENDIF
RETURN ::oRoot:Write( fHandle, nStyle )
METHOD FindFirst( cName, cAttrib, cValue, cData ) CLASS TXmlDocument
::oIterator := TXmlIteratorScan():New( ::oRoot )
RETURN ::oIterator:Find( cName, cAttrib, cValue, cData )