Author: kkaempf
Date: Mon Jul 9 14:07:41 2007
New Revision: 39247
URL: http://svn.opensuse.org/viewcvs/yast?rev=39247&view=rev
Log:
further cleanup on XML output
Modified:
trunk/core/libycp/src/YCode.cc
trunk/core/libycp/src/YExpression.cc
trunk/core/libycp/src/YStatement.cc
Modified: trunk/core/libycp/src/YCode.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCode.cc?rev=39247&r1=39246&r2=39247&view=diff
==============================================================================
--- trunk/core/libycp/src/YCode.cc (original)
+++ trunk/core/libycp/src/YCode.cc Mon Jul 9 14:07:41 2007
@@ -816,9 +816,7 @@
m_declaration->toXml (str, indent+4 );
str << Xmlcode::spaces( indent+2 ) << "</declaration>\n";
}
- str << Xmlcode::spaces( indent+2 ) << "<definition>\n";
- m_definition->toXml (str, indent+4 );
- str << Xmlcode::spaces( indent+2 ) << "</definition>\n";
+ m_definition->toXml (str, indent+2 );
if (need_declaration)
{
Xmlcode::popNamespace (m_declaration->nameSpace());
Modified: trunk/core/libycp/src/YExpression.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YExpression.cc?rev=39247&r1=39246&r2=39247&view=diff
==============================================================================
--- trunk/core/libycp/src/YExpression.cc (original)
+++ trunk/core/libycp/src/YExpression.cc Mon Jul 9 14:07:41 2007
@@ -2920,17 +2920,17 @@
std::ostream &
YECall::toXml (std::ostream & str, int indent ) const
{
- str << "nameSpace()->name() << "\" name=\"" << m_sentry->name() << "\">";
+ str << "nameSpace()->name() << "\" name=\"" << m_sentry->name() << "\">";
if (m_next_param_id > 0) {
- str << "<parameters>";
+ str << "<parameter>";
for (uint i = 0 ; i < m_next_param_id; i++)
{
m_parameters[i]->toXml( str, 0 );
}
- str << "</parameters>";
+ str << "</parameter>";
}
- return str << "</call>";
+ return str << "</yecall>";
}
Modified: trunk/core/libycp/src/YStatement.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YStatement.cc?rev=39247&r1=39246&r2=39247&view=diff
==============================================================================
--- trunk/core/libycp/src/YStatement.cc (original)
+++ trunk/core/libycp/src/YStatement.cc Mon Jul 9 14:07:41 2007
@@ -417,7 +417,7 @@
std::ostream &
YSReturn::toXml (std::ostream & str, int indent ) const
{
- str << "<return>";
+ str << Xmlcode::spaces( indent ) << "<return>";
if (m_value != 0)
m_value->toXml( str, 0 );
return str << "</return>";
@@ -1020,14 +1020,14 @@
{
str << endl << Xmlcode::spaces( indent+2 ) << "<then>\n";
m_true->toXml( str, indent+4 );
- str << Xmlcode::spaces( indent+2 ) << "</then>\n";
+ str << endl << Xmlcode::spaces( indent+2 ) << "</then>\n";
str << Xmlcode::spaces( indent );
}
if (m_false)
{
str << endl << Xmlcode::spaces( indent+2 ) << "<else>\n";
m_false->toXml( str, indent+4 );
- str << Xmlcode::spaces( indent+2 ) << "</else>\n";
+ str << endl << Xmlcode::spaces( indent+2 ) << "</else>\n";
str << Xmlcode::spaces( indent );
}
return str << "</if>";
@@ -1560,7 +1560,7 @@
std::ostream &
YSTextdomain::toXml (std::ostream & str, int indent ) const
{
- return str << "<textdomain>" << m_domain.asString() << "</textdomain>";
+ return str << "";
}
@@ -1782,7 +1782,7 @@
YSImport::toXml( std::ostream & str, int indent ) const
{
Xmlcode::pushNamespace (nameSpace()); // see YBlock::toXml(str) for popUptoNamespace()
- return str << "<import>" << m_name.asString() << "</import>";
+ return str << "";
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
