research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed findXMLPhase() to return a non const XML tree. It broke the

Browse source 
runDiamond program the other way, because importPhase() uses a
non const XML tree argument.
Also, the change commits a small alteration in the xml write operation
that allows for the top level of an xml file to contain multiple
elements. previously this was not possible.
This commit is contained in:
Harry Moffat 2003-08-21 22:32:03 +00:00
parent a9f0c07dda
commit 2780df87b6
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Cantera/src/xml.cpp
View file

@ -663,11 +663,22 @@ namespace Cantera {
* Write an XML subtree to an output stream. This is a
* wrapper around the static routine write_int(). All this
* does is add an endl on to the output stream. write_int() is
* fine, but the last endl wasn't beeing written.
* fine, but the last endl wasn't being written.
* It also checks for the special name "--". If found and we
* are at the root of the xml tree, then the block
* is skipped and the children are processed. "--" is used
* to denote the top of the tree.
*/
void XML_Node::write(ostream& s, int level) {
write_int(s, level);
s << endl;
if (m_name == "--" && m_root == this) {
for (int i = 0; i < m_nchildren; i++) {
m_children[i]->write_int(s,level);
s << endl;
}
} else {
write_int(s, level);
s << endl;
}
}
//const XML_Node* XML_Node::getRef() const {
@ -754,8 +765,8 @@ namespace Cantera {
#endif
const XML_Node* findXMLPhase(XML_Node *root, string idtarget) {
const XML_Node *scResult = 0;
XML_Node * const findXMLPhase(XML_Node *root, string idtarget) {
XML_Node *scResult = 0;
XML_Node *sc;
if (!root) return 0;
string idattrib;

2
Cantera/src/xml.h
View file

@ -263,7 +263,7 @@ namespace Cantera {
//XML_Node* find_XML(string src, XML_Node* root=0,
// string id="", string loc="", string name="");
const XML_Node* findXMLPhase(XML_Node* root, string id);
XML_Node * const findXMLPhase(XML_Node* root, string id);
}
#endif