Author: kkaempf Date: Tue Jul 17 15:31:05 2007 New Revision: 39470 URL: http://svn.opensuse.org/viewcvs/yast?rev=39470&view=rev Log: fix switch/case/default xml output Modified: trunk/core/libycp/src/YBlock.cc trunk/core/libycp/src/YStatement.cc Modified: trunk/core/libycp/src/YBlock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YBlock.cc?rev=39470&r1=39469&r2=39470&view=diff ============================================================================== --- trunk/core/libycp/src/YBlock.cc (original) +++ trunk/core/libycp/src/YBlock.cc Tue Jul 17 15:31:05 2007 @@ -543,14 +543,16 @@ if (index == defaultcase) { str << "<default>\n"; - str << stmt->stmt->toXml( str, indent+2 ) << endl; - str << "</default>"; + stmt->stmt->toXml( str, indent+2 ); + str << endl << "</default>"; } else if (! values[index].isNull ()) { - str << "<case>" << values[index]->toXml( str, 0 ) << endl; - str << stmt->stmt->toXml( str, indent+2 ) << endl; - str << "</case>"; + str << "<case>"; + values[index]->toXml( str, 0 ); + str << endl; + stmt->stmt->toXml( str, indent+2 ); + str << endl << "</case>"; } stmt = stmt->next; index++; Modified: trunk/core/libycp/src/YStatement.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YStatement.cc?rev=39470&r1=39469&r2=39470&view=diff ============================================================================== --- trunk/core/libycp/src/YStatement.cc (original) +++ trunk/core/libycp/src/YStatement.cc Tue Jul 17 15:31:05 2007 @@ -573,9 +573,9 @@ std::ostream & YSTypedef::toXml( std::ostream & str, int indent ) const { - str << ""; + str << "toXml( str, 0 ); - return str << "</typedef>"; + return str << "/>"; } @@ -1945,9 +1945,9 @@ { str << "<switch>"; - str << "<condition>"; + str << "<cond>"; m_condition->toXml( str, 0 ); - str << "</condition>\n"; + str << "</cond>\n"; m_block->toXmlSwitch( m_cases, m_defaultcase, str, indent+2 ); return str << endl << Xmlcode::spaces( indent ) << "</switch>"; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org