Commit 45aad5aa authored by David E. DeMarle's avatar David E. DeMarle

fix failing tests by switching a merge conflict resolution

these tests fail with it the other way.
C_CTestXdmfWriter (Failed)
C_CTestXdmfAggregate (Failed)
Cxx_TestXdmfAggregate (Failed)
Cxx_TestXdmfFunction (Failed) new fail
Cxx_TestXdmfSubset

xml file for aggregate is no different, but reading
balks at lack of "Content" the other way around
parent e721d8d6
...@@ -215,6 +215,27 @@ public: ...@@ -215,6 +215,27 @@ public:
if (mItemFactory->isArrayTag((char *)currNode->name)) { if (mItemFactory->isArrayTag((char *)currNode->name)) {
while(childNode != NULL) { while(childNode != NULL) {
if(childNode->type == XML_TEXT_NODE && childNode->content) { if(childNode->type == XML_TEXT_NODE && childNode->content) {
#if 1 //ARL's side
const char * content = (char*)childNode->content;
// Determine if content is whitespace
bool whitespace = true;
const char * contentPtr = content;
// Step through to end of pointer
while(contentPtr != NULL) {
// If not a whitespace character, break
if(!isspace(*contentPtr++)) {
whitespace = false;
break;
}
}
if(!whitespace) {
itemProperties.insert(std::make_pair("Content", content));
itemProperties.insert(std::make_pair("XMLDir", mXMLDir));
break;
}
#else //VTK's side, breaks XDMF's tests, revisit if problematic in VTK
std::string content((char *)childNode->content); std::string content((char *)childNode->content);
boost::algorithm::trim(content); boost::algorithm::trim(content);
...@@ -223,6 +244,7 @@ public: ...@@ -223,6 +244,7 @@ public:
itemProperties.insert(std::make_pair("XMLDir", mXMLDir)); itemProperties.insert(std::make_pair("XMLDir", mXMLDir));
break; break;
} }
#endif
} }
childNode = childNode->next; childNode = childNode->next;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment