hwgui-commits Mailing List for HwGUI

Revision: 1844
          http://hwgui.svn.sourceforge.net/hwgui/?rev=1844&view=rev
Author:   alkresin
Date:     2012-06-06 11:11:24 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
2012-06-06 15:10 UTC+0300 Alexander Kresin <al...@be...>

Modified Paths:
--------------
    trunk/hwgui/Changelog
    trunk/hwgui/source/xml/hxmldoc.prg
    trunk/hwgui/source/xml/xmlparse.c

Modified: trunk/hwgui/Changelog
===================================================================
--- trunk/hwgui/Changelog	2012-06-06 08:51:02 UTC (rev 1843)
+++ trunk/hwgui/Changelog	2012-06-06 11:11:24 UTC (rev 1844)
@@ -8,6 +8,13 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <fo...@fo...>
 */
 
+2012-06-06 15:10 UTC+0300 Alexander Kresin <al...@be...>
+   * source/xml/hxmldoc.prg
+   * source/xml/xmlparse.c
+     * Errors handling has been improved.
+     * HXMLDoc():Read() returns Nil if an error had been occured and the
+       HXMLDoc:nLastErr keeps the error code.
+
 2012-06-06 12:50 UTC+0300 Alexander Kresin <al...@be...>
    * source/xml/hxmldoc.prg
      ! Small fixes and additions, which I've made earlier

Modified: trunk/hwgui/source/xml/hxmldoc.prg
===================================================================
--- trunk/hwgui/source/xml/hxmldoc.prg	2012-06-06 08:51:02 UTC (rev 1843)
+++ trunk/hwgui/source/xml/hxmldoc.prg	2012-06-06 11:11:24 UTC (rev 1844)
@@ -19,6 +19,7 @@
 
 CLASS HXMLNode
 
+   CLASS VAR nLastErr SHARED
    DATA title
    DATA type
    DATA aItems  INIT {}
@@ -215,15 +216,15 @@
    IF fname != Nil
       han := FOpen( fname, FO_READ )
       IF han != -1
-         hbxml_GetDoc( Self,han )
+         ::nLastErr := hbxml_GetDoc( Self,han )
          FClose( han )
       ENDIF
    ELSEIF buffer != Nil
-      hbxml_GetDoc( Self,buffer )
+      ::nLastErr := hbxml_GetDoc( Self,buffer )
    ELSE
       Return Nil
    ENDIF
-Return Self
+Return Iif( ::nLastErr == 0, Self, Nil )
 
 METHOD Save( fname,lNoHeader ) CLASS HXMLDoc
 Local handle := -2

Modified: trunk/hwgui/source/xml/xmlparse.c
===================================================================
--- trunk/hwgui/source/xml/xmlparse.c	2012-06-06 08:51:02 UTC (rev 1843)
+++ trunk/hwgui/source/xml/xmlparse.c	2012-06-06 11:11:24 UTC (rev 1844)
@@ -48,13 +48,13 @@
 static int nParseError;
 static HB_ULONG ulOffset;
 
+#define HBXML_PREDEFS_KOL         6
 static unsigned char *predefinedEntity1[] =
       { ( unsigned char * ) "lt;", ( unsigned char * ) "gt;",
          ( unsigned char * ) "amp;", ( unsigned char * ) "quot;",
-         ( unsigned char * ) "apos;" };
-static unsigned char *predefinedEntity2 = ( unsigned char * ) "<>&\"\'";
+         ( unsigned char * ) "apos;", ( unsigned char * ) "nbsp;" };
+static unsigned char *predefinedEntity2 = ( unsigned char * ) "<>&\"\' ";
 
-
 void hbxml_error( int nError, unsigned char *ptr )
 {
    nParseError = nError;
@@ -119,11 +119,6 @@
 PHB_ITEM hbxml_pp( unsigned char *ptr, HB_ULONG ulLen )
 {
    unsigned char *ptrStart = ptr;
-   unsigned char *predefinedEntity1[] =
-         { ( unsigned char * ) "lt;", ( unsigned char * ) "gt;",
-            ( unsigned char * ) "amp;", ( unsigned char * ) "quot;",
-            ( unsigned char * ) "apos;" };
-   unsigned char *predefinedEntity2 = ( unsigned char * ) "<>&\"\'";
    int i, nlen;
    HB_ULONG ul = 0, ul1;
 
@@ -147,7 +142,7 @@
          }
          else
          {
-            for( i = 0; i < 5; i++ )
+            for( i = 0; i < HBXML_PREDEFS_KOL; i++ )
             {
                nlen = strlen( ( char * ) predefinedEntity1[i] );
                if( !memcmp( ptr + 1, predefinedEntity1[i], nlen ) )
@@ -159,7 +154,7 @@
                   break;
                }
             }
-            if( i == 5 )
+            if( i == HBXML_PREDEFS_KOL )
                hbxml_error( HBXML_ERROR_WRONG_ENTITY, ptr );
          }
       }
@@ -394,7 +389,7 @@
    ( *pBuffer )--;
    if( **pBuffer == '?' )
       ( *pBuffer )--;
-   if( ( pArray = hbxml_getattr( pBuffer, &lSingle ) ) == NULL )
+   if( ( pArray = hbxml_getattr( pBuffer, &lSingle ) ) == NULL || nParseError )
    {
       hb_itemRelease( pNode );
       return HB_FALSE;
@@ -431,12 +426,21 @@
             hb_objSendMsg( pNode, "AITEMS", 0 );
             hb_arrayAdd( hb_param( -1, HB_IT_ANY ), pTemp );
             hb_itemRelease( pTemp );
+            if( nParseError )
+            {
+               hb_itemRelease( pNode );
+               return HB_FALSE;
+            }
          }
 
          if( *( *pBuffer + 1 ) == '/' )
          {
             if( memcmp( *pBuffer + 2, cNodeName, nLenNodeName ) )
+            {
                hbxml_error( HBXML_ERROR_WRONG_TAG_END, *pBuffer );
+               hb_itemRelease( pNode );
+               return HB_FALSE;
+            }
             else
             {
                while( **pBuffer != '>' )
@@ -520,6 +524,15 @@
       {
          HB_BOOL lSingle;
          PHB_ITEM pArray = hbxml_getattr( &ptr, &lSingle );
+         if( !pArray || nParseError )
+         {
+            if( bFile )
+               hb_xfree( cBuffer );
+            if( pArray )
+               hb_itemRelease( pArray );
+            hb_retni( nParseError );
+            return;
+         }
          hb_objSendMsg( pDoc, "_AATTR", 1, pArray );
          hb_itemRelease( pArray );
          HB_SKIPTABSPACES( ptr );
@@ -553,8 +566,6 @@
    if( bFile )
       hb_xfree( cBuffer );
 
-   if( nParseError )
-      hb_retni( nParseError );
-   else
-      hb_retni( 0 );
+   hb_retni( nParseError );
 }
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1843
          http://hwgui.svn.sourceforge.net/hwgui/?rev=1843&view=rev
Author:   alkresin
Date:     2012-06-06 08:51:02 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
2012-06-06 12:50 UTC+0300 Alexander Kresin <al...@be...>

Modified Paths:
--------------
    trunk/hwgui/Changelog
    trunk/hwgui/source/xml/hxmldoc.prg

Modified: trunk/hwgui/Changelog
===================================================================
--- trunk/hwgui/Changelog	2012-02-11 14:35:18 UTC (rev 1842)
+++ trunk/hwgui/Changelog	2012-06-06 08:51:02 UTC (rev 1843)
@@ -7,6 +7,11 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <fo...@fo...>
 */
+
+2012-06-06 12:50 UTC+0300 Alexander Kresin <al...@be...>
+   * source/xml/hxmldoc.prg
+     ! Small fixes and additions, which I've made earlier
+
 2012-02-11 12:00 UTC-0300 Luiz Rafael Culik (luiz at xharbour.com)
  - samples/image/BUILD.BMP
    samples/image/DOOR.BMP

Modified: trunk/hwgui/source/xml/hxmldoc.prg
===================================================================
--- trunk/hwgui/source/xml/hxmldoc.prg	2012-02-11 14:35:18 UTC (rev 1842)
+++ trunk/hwgui/source/xml/hxmldoc.prg	2012-06-06 08:51:02 UTC (rev 1843)
@@ -23,11 +23,13 @@
    DATA type
    DATA aItems  INIT {}
    DATA aAttr   INIT {}
+   DATA cargo
 
    METHOD New( cTitle, type, aAttr )
    METHOD Add( xItem )
    METHOD GetAttribute( cName )
    METHOD SetAttribute( cName,cValue )
+   METHOD DelAttribute( cName )
    METHOD Save( handle,level )
    METHOD Find( cTitle,nStart )
 ENDCLASS
@@ -63,10 +65,23 @@
 
 Return .T.
 
+METHOD DelAttribute( cName ) CLASS HXMLNode
+Local i := Ascan( ::aAttr,{|a|a[1]==cName} )
+
+   IF i != 0
+      Adel( ::aAttr, i )
+      Asize( ::aAttr, Len( ::aAttr ) - 1 )
+   ENDIF
+Return .T.
+
 METHOD Save( handle,level ) CLASS HXMLNode
-Local i, s, lNewLine
+Local i, s := Space(level*2)+'<', lNewLine
 
-   s := Space(level*2) + '<'
+   IF !__mvExist( "HXML_NEWLINE" )
+      __mvPrivate( "HXML_NEWLINE" )
+      __mvPut( "HXML_NEWLINE", .T. )
+   ENDIF
+   lNewLine := m->hxml_newline
    IF ::type == HBXML_TYPE_COMMENT
       s += '!--'
    ELSEIF ::type == HBXML_TYPE_CDATA
@@ -81,20 +96,20 @@
          s += ' ' + ::aAttr[i,1] + '="' + HBXML_Transform(::aAttr[i,2]) + '"'
       NEXT
    ENDIF
-   IF ::type == HBXML_TYPE_COMMENT
-      s += '-->' + Chr(10)
-   ELSEIF ::type == HBXML_TYPE_PI
+   IF ::type == HBXML_TYPE_PI
       s += '?>' + Chr(10)
+      m->hxml_newline := .T.
    ELSEIF ::type == HBXML_TYPE_SINGLE
       s += '/>' + Chr(10)
+      m->hxml_newline := .T.
    ELSEIF ::type == HBXML_TYPE_TAG
       s += '>'
-      IF Len(::aItems) == 1 .AND. Valtype(::aItems[1]) == "C" .AND. ;
-                Len(::aItems[1]) + Len(s) < 80
-         lNewLine := .F.
+      IF Empty( ::aItems ) .OR. ( Len(::aItems) == 1 .AND. ;
+            Valtype(::aItems[1]) == "C" .AND. Len(::aItems[1]) + Len(s) < 80 )
+         lNewLine := m->hxml_newline := .F.
       ELSE
          s += Chr(10)
-         lNewLine := .T.
+         lNewLine := m->hxml_newline := .T.
       ENDIF
    ENDIF
    IF handle >= 0
@@ -104,33 +119,45 @@
    FOR i := 1 TO Len( ::aItems )
       IF Valtype( ::aItems[i] ) == "C"
         IF handle >= 0
-           IF ::type == HBXML_TYPE_CDATA
+           IF ::type == HBXML_TYPE_CDATA .OR. ::type == HBXML_TYPE_COMMENT
               FWrite( handle, ::aItems[i] )
            ELSE
               FWrite( handle, HBXML_Transform( ::aItems[i] ) )
            ENDIF
+           IF lNewLine
+              FWrite( handle, Chr(10) )
+           ENDIF
         ELSE
-           IF ::type == HBXML_TYPE_CDATA
+           IF ::type == HBXML_TYPE_CDATA .OR. ::type == HBXML_TYPE_COMMENT
               s += ::aItems[i]
            ELSE
               s += HBXML_Transform( ::aItems[i] )
            ENDIF
+           IF lNewLine
+              s += Chr(10)
+           ENDIF
         ENDIF
+        m->hxml_newline := .F.
       ELSE
         s += ::aItems[i]:Save( handle, level+1 )
       ENDIF
    NEXT
+   m->hxml_newline := .T.
    IF handle >= 0
       IF ::type == HBXML_TYPE_TAG
          FWrite( handle, Iif(lNewLine,Space(level*2),"") + '</' + ::title + '>' + Chr(10 ) )
       ELSEIF ::type == HBXML_TYPE_CDATA
          FWrite( handle, ']]>' + Chr(10) )
+      ELSEIF ::type == HBXML_TYPE_COMMENT
+         FWrite( handle, '-->' + Chr(10) )
       ENDIF
    ELSE
       IF ::type == HBXML_TYPE_TAG
          s += Iif(lNewLine,Space(level*2),"") + '</' + ::title + '>' + Chr(10 )
       ELSEIF ::type == HBXML_TYPE_CDATA
          s += ']]>' + Chr(10)
+      ELSEIF ::type == HBXML_TYPE_COMMENT
+         s += '-->' + Chr(10)
       ENDIF
       Return s
    ENDIF

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.