actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make XNode::GetXML() and XAttr::GetXML write out to a file directly, rather than concatinating on a std::ostringstream, which was taking a long time.

Browse Source
This commit is contained in:
Thad Ward
2004-05-21 22:57:54 +00:00
parent 8a9cfa8bdf
commit 540c2fe79d
2 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/XmlFile.cpp
+18 -25
View File
@@ -552,13 +552,9 @@ char* XNode::Load( const char* pszXml, LPPARSEINFO pi /*= &piDefault*/ )
// Coder Date Desc // Coder Date Desc
// bro 2002-10-29 // bro 2002-10-29
//======================================================== //========================================================
CString XAttr::GetXML( LPDISP_OPT opt /*= &optDefault*/ ) void XAttr::GetXML( RageFile &f, LPDISP_OPT opt /*= &optDefault*/ )
{ {
std::ostringstream os; f.Write(name + "='" + (opt->reference_value&&opt->entitys?opt->entitys->Entity2Ref(value):value) + "' ");
//os << (const char*)name << "='" << (const char*)value << "' ";
os << (const char*)name << "='"
<< (const char*)(opt->reference_value&&opt->entitys?opt->entitys->Entity2Ref(value):value) << "' ";
return os.str().c_str();
} }
//======================================================== //========================================================
@@ -570,45 +566,44 @@ CString XAttr::GetXML( LPDISP_OPT opt /*= &optDefault*/ )
// Coder Date Desc // Coder Date Desc
// bro 2002-10-29 // bro 2002-10-29
//======================================================== //========================================================
CString XNode::GetXML( LPDISP_OPT opt /*= &optDefault*/ ) void XNode::GetXML( RageFile &f, LPDISP_OPT opt /*= &optDefault*/ )
{ {
std::ostringstream os;
// tab // tab
if( opt && opt->newline ) if( opt && opt->newline )
{ {
if( opt && opt->newline ) if( opt && opt->newline )
os << "\r\n"; f.Write("\r\n");
for( int i = 0 ; i < opt->tab_base ; i++) for( int i = 0 ; i < opt->tab_base ; i++)
os << '\t'; f.Write("\t");
} }
// <TAG // <TAG
os << '<' << (const char*)name; f.Write("<" + name);
// <TAG Attr1="Val1" // <TAG Attr1="Val1"
if( attrs.empty() == false ) os << ' '; if( attrs.empty() == false ) f.Write(" "); //os << ' ';
for( unsigned i = 0 ; i < attrs.size(); i++ ) for( unsigned i = 0 ; i < attrs.size(); i++ )
{ {
os << (const char*)attrs[i]->GetXML(opt); attrs[i]->GetXML(f, opt);
} }
if( childs.empty() && value.empty() ) if( childs.empty() && value.empty() )
{ {
// <TAG Attr1="Val1"/> alone tag // <TAG Attr1="Val1"/> alone tag
os << "/>"; f.Write("/>");
} }
else else
{ {
// <TAG Attr1="Val1"> and get child // <TAG Attr1="Val1"> and get child
os << '>'; f.Write(">");
if( opt && opt->newline && !childs.empty() ) if( opt && opt->newline && !childs.empty() )
{ {
opt->tab_base++; opt->tab_base++;
} }
for( unsigned i = 0 ; i < childs.size(); i++ ) for( unsigned i = 0 ; i < childs.size(); i++ )
os << (const char*)childs[i]->GetXML( opt ); childs[i]->GetXML( f, opt );
// Text Value // Text Value
if( value != ("") ) if( value != ("") )
@@ -616,21 +611,21 @@ CString XNode::GetXML( LPDISP_OPT opt /*= &optDefault*/ )
if( opt && opt->newline && !childs.empty() ) if( opt && opt->newline && !childs.empty() )
{ {
if( opt && opt->newline ) if( opt && opt->newline )
os << "\r\n"; f.Write("\r\n");
for( int i = 0 ; i < opt->tab_base ; i++) for( int i = 0 ; i < opt->tab_base ; i++)
os << '\t'; f.Write("\t");
} }
os << (const char*)(opt->reference_value&&opt->entitys?opt->entitys->Entity2Ref(value):value); f.Write((opt->reference_value&&opt->entitys?opt->entitys->Entity2Ref(value):value));
} }
// </TAG> CloseTag // </TAG> CloseTag
if( opt && opt->newline && !childs.empty() ) if( opt && opt->newline && !childs.empty() )
{ {
os << "\r\n"; f.Write("\r\n");
for( int i = 0 ; i < opt->tab_base-1 ; i++) for( int i = 0 ; i < opt->tab_base-1 ; i++)
os << '\t'; f.Write("\t");
} }
os << "</" << (const char*)name << '>'; f.Write("</" + name + ">");
if( opt && opt->newline ) if( opt && opt->newline )
{ {
@@ -638,8 +633,6 @@ CString XNode::GetXML( LPDISP_OPT opt /*= &optDefault*/ )
opt->tab_base--; opt->tab_base--;
} }
} }
return os.str().c_str();
} }
//======================================================== //========================================================
@@ -1247,6 +1240,6 @@ bool XNode::SaveToFile( CString sFile, LPDISP_OPT opt )
LOG->Warn("Couldn't open %s for writing: %s", sFile.c_str(), f.GetError().c_str() ); LOG->Warn("Couldn't open %s for writing: %s", sFile.c_str(), f.GetError().c_str() );
return false; return false;
} }
f.Write( this->GetXML(opt) ); this->GetXML(f, opt);
return true; return true;
} }
stepmania/src/XmlFile.h
+2 -2
View File
@@ -110,7 +110,7 @@ struct XAttr
XNode* parent; XNode* parent;
CString GetXML( LPDISP_OPT opt = &optDefault ); void GetXML( RageFile &f, LPDISP_OPT opt = &optDefault );
}; };
typedef XAttr* LPXAttr; typedef XAttr* LPXAttr;
@@ -134,7 +134,7 @@ struct XNode
// Load/Save XML // Load/Save XML
char* Load( const char* pszXml, LPPARSEINFO pi = &piDefault ); char* Load( const char* pszXml, LPPARSEINFO pi = &piDefault );
char* LoadAttributes( const char* pszAttrs, LPPARSEINFO pi = &piDefault ); char* LoadAttributes( const char* pszAttrs, LPPARSEINFO pi = &piDefault );
CString GetXML( LPDISP_OPT opt = &optDefault ); void GetXML( RageFile &f, LPDISP_OPT opt = &optDefault );
bool LoadFromFile( CString sFile, LPPARSEINFO pi = &piDefault ); bool LoadFromFile( CString sFile, LPPARSEINFO pi = &piDefault );
bool SaveToFile( CString sFile, LPDISP_OPT opt = &optDefault ); bool SaveToFile( CString sFile, LPDISP_OPT opt = &optDefault );