Changeset 1363 for XIOS/dev/XIOS_DEV_CMIP6/src/xml_node.cpp

Timestamp:

12/06/17 18:36:26 (6 years ago)

Author:

ymipsl

Message:

Fix : when arithmetic field expression is defined, other xml node are now taking into account.

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/xml_node.cpp (modified) (4 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/xml_node.cpp

@@ -1 +1 @@
 #include "xml_node.hpp"
+#include <boost/algorithm/string.hpp>
 
 namespace xios
@@ -26 +27 @@
          bool retvalue = false;
          for(rapidxml::xml_node<char> * nextElement = this->node->next_sibling();
-                                      ; nextElement = this->node->next_sibling())
+                                      ; nextElement = nextElement->next_sibling())
          {
             if (nextElement == NULL) break;
@@ -67 +68 @@
          return (!retvalue);
       }
-
+/*
       bool CXMLNode::getContent(StdString & content)
       {
@@ -73 +74 @@
          content.assign(this->node->value(), this->node->value_size());
          return (true);
+      }
+*/
+      bool CXMLNode::getContent(StdString & content)
+      {
+         content="" ;
+         bool retvalue = false;
+         
+         rapidxml::xml_node<char> * nextElement = this->node->first_node();
+         while (nextElement != NULL)
+         {
+             if (nextElement->type() == rapidxml::node_data) content=content+std::string(nextElement->value(),nextElement->value_size());
+             nextElement = nextElement->next_sibling(); 
+         }
+         boost::algorithm::replace_all(content,"\n"," ") ;
+         boost::algorithm::trim(content) ;
+         if (content.size()==0) return false ;
+         else return true ;
       }