[Eas-dev-commit]eas-dev/libs/libsxmlstream/src Makefile.am,1.3,1.4 sxml.cxx,1.3,1.4 sxmlstream.cxx,1.7,1.8

[Yurii R. <yr...@us...>]

Update of /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30198/libs/libsxmlstream/src

Modified Files:
	Makefile.am sxml.cxx sxmlstream.cxx 
Log Message:
modified build process; moving to glib-2.2.0; pkg-config;
unstable changes to `logger' component; minor changes to libsxmlstream;
binarystream test added to libsxmlstream (both text and binary streams
are broken now); per-platform INSTALL notes


Index: Makefile.am
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	28 Jan 2003 22:39:11 -0000	1.3
+++ Makefile.am	2 Feb 2003 06:59:11 -0000	1.4
@@ -2,4 +2,4 @@
 libsxmlstream_la_SOURCES = sxml.cxx sxmlstream.cxx
 INCLUDES = -I../include -I$(top_srcdir)
 CXXFLAGS = @GLIB_CFLAGS@
-libsxmlstream_la_LIBADD = -lglib
+libsxmlstream_la_LIBADD = @GLIB_LIBS@

Index: sxml.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxml.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sxml.cxx	28 Jan 2003 22:36:26 -0000	1.3
+++ sxml.cxx	2 Feb 2003 06:59:11 -0000	1.4
@@ -7,7 +7,7 @@
 /*                                                     */
 /* Author(s):                                          */
 /*    Yurii A. Rashkovskii <yr...@op...>        */
-/*    Egor Cheshkov <eg...@ip...>                    */
+/*    Egor Cheshkov        <eg...@ip...>             */
 /*                                                     */
 /*                                                     */
 /* This program is free software; you can redistribute */

Index: sxmlstream.cxx
===================================================================
RCS file: /cvsroot/eas-dev/eas-dev/libs/libsxmlstream/src/sxmlstream.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sxmlstream.cxx	28 Jan 2003 22:36:27 -0000	1.7
+++ sxmlstream.cxx	2 Feb 2003 06:59:11 -0000	1.8
@@ -7,6 +7,7 @@
 /*                                                     */
 /* Author(s):                                          */
 /*    Yurii A. Rashkovskii <yr...@op...>        */
+/*    Egor Cheshkov        <eg...@ip...>             */
 /*                                                     */
 /*                                                     */
 /* This program is free software; you can redistribute */
@@ -95,6 +96,7 @@
 		       os << BIN_SIGN << BIN_PORTABLE_SIZE(e.data.length()) << 
 			     e.data;
 		       // Output attributes
+		       if (!(e.descendants)->empty()) {
 		       iter = (e.descendants)->begin();
 		       while (iter!=(e.descendants)->end())
 		       {
@@ -106,7 +108,9 @@
 			       }
 			       iter++;
 		       }
+		       }
 		       // Output descendants
+		       if (!(e.descendants)->empty()) {
 		       iter = (e.descendants)->begin();
 		       while (iter!=(e.descendants)->end())
 		       {
@@ -116,6 +120,7 @@
 			       }
 			       iter++;
 		       }
+		       }
 			       
 		       os << BIN_RBRACKET;
 		       break;
@@ -192,6 +197,7 @@
 	          case SXmlNode_Element_t:
 		       os << "(" << e.data << " ";
 		       // Output attributes
+		       if (!(e.descendants)->empty()) {		       
 		       iter = (e.descendants)->begin();
 		       while (iter!=(e.descendants)->end())
 		       {
@@ -203,7 +209,9 @@
 			       }
 			       iter++;
 		       }
+		       }
 		       // Output descendants
+		       if (!(e.descendants)->empty()) {		       
 		       iter = (e.descendants)->begin();
 		       while (iter!=(e.descendants)->end())
 		       {
@@ -212,6 +220,7 @@
 				       SXml_TextOutput(os,(*iter));
 			       }
 			       iter++;
+		       }
 		       }
 			       
 		       os << ")";