Changeset 1363 for XIOS/dev/XIOS_DEV_CMIP6

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

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• node/field.cpp (modified) (1 diff)
• xml_node.cpp (modified) (4 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp

@@ -1509 +1509 @@
    void CField::parse(xml::CXMLNode& node)
    {
+      string newContent ;
       SuperClass::parse(node);
-      if (!node.getContent(this->content))
+      if (node.goToChildElement())
       {
-        if (node.goToChildElement())
+        do
         {
-          do
-          {
-            if (node.getElementName() == "variable" || node.getElementName() == "variable_group") this->getVirtualVariableGroup()->parseChild(node);
-          } while (node.goToNextElement());
-          node.goToParentElement();
-        }
-      }
+          if (node.getElementName() == "variable" || node.getElementName() == "variable_group") this->getVirtualVariableGroup()->parseChild(node);
+          else if (node.getElementName() == "expr") if (node.getContent(newContent)) content+=newContent ;
+        } while (node.goToNextElement());
+        node.goToParentElement();
+      }
+      if (node.getContent(newContent)) content=newContent ;
     }
 

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 ;
       }