Changeset 277

Timestamp:

09/20/11 18:10:41 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv

Files:

• iodef.xml (added)
• src/xmlio/attribute_map.cpp (modified) (2 diffs)
• src/xmlio/group_factory.hpp (modified) (1 diff)
• src/xmlio/group_parser.hpp (modified) (2 diffs)
• src/xmlio/main_server.cpp (modified) (1 diff)
• src/xmlio/node/context.cpp (modified) (1 diff)
• src/xmlio/node/domain.cpp (modified) (2 diffs)
• src/xmlio/node/grid.cpp (modified) (1 diff)
• src/xmlio/output/nc4_data_output.cpp (modified) (3 diffs)
• src/xmlio/xml_node.cpp (modified) (3 diffs)
• src/xmlio/xml_node.hpp (modified) (1 diff)
• src/xmlio/xml_parser.cpp (modified) (3 diffs)
• src/xmlio/xml_parser.hpp (modified) (2 diffs)

XMLIO_V2/dev/dev_rv/src/xmlio/attribute_map.cpp

@@ -96 +96 @@
                                                    it != attributes.end();
                                                    it ++)
+         {
             if ((*it).first.compare(StdString("id")) != 0 &&
                 (*it).first.compare(StdString("src"))!= 0)
@@ -102 +103 @@
                CAttributeMap::operator[]((*it).first)->fromString((*it).second);
             }
+         }
       }
       

XMLIO_V2/dev/dev_rv/src/xmlio/group_factory.hpp

@@ -10 +10 @@
 #include "object_factory.hpp"
 #include "group_template.hpp"
+#include "xml_parser.hpp"
 
 namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/group_parser.hpp

@@ -13 +13 @@
 
       StdString name = node.getElementName();
+      xml::THashAttributes attributes = node.getAttributes();
       if (withAttr)
+      {
          CGroupTemplate<U, V, W>::SuperClass::parse(node);
+         if (attributes.end() != attributes.find("src"))
+         {
+            StdIFStream ifs ( attributes["src"].c_str() , StdIFStream::in );
+            if (!ifs.good())
+               ERROR("CGroupTemplate<U, V, W>::parse(xml::CXMLNode & node, bool withAttr)",
+                     << "[ filename = " << attributes["src"] << " ] Bad xml stream !");
+            xml::CXMLParser::ParseInclude(ifs, *this);
+         }
+      }
 
       // PARSING POUR GESTION DES ENFANTS
-      xml::THashAttributes attributes;
       boost::shared_ptr<V> group_ptr = (this->hasId())
          ? CObjectFactory::GetObject<V>(this->getId())
@@ -61 +71 @@
                   << "\' ne peut contenir qu'un objet de type \'" << V::GetName()
                   << "\' ou de type \'" << U::GetName()
-                  << "\' !");
+                  << "\' (reçu : " << name << ") !");
 
          } while (node.goToNextElement());

XMLIO_V2/dev/dev_rv/src/xmlio/main_server.cpp

@@ -35 +35 @@
          CMPIManager ::DispatchClient(false, comm_client, comm_client_server,  comm_server);
          CTreeManager::ParseFile("iodef.xml");
+         CTreeManager::SetCurrentContextId("context1");
          boost::shared_ptr<CContext> context =
              CObjectFactory::GetObject<CContext>("context1");
          xios_set_timestep(0, 0, 0, 1, 0, 0);
          xios_dtreatment_start(context.get(), 0, comm_client_server, -1);
+
          for (int i = 0; i < 200; i++)
          {

XMLIO_V2/dev/dev_rv/src/xmlio/node/context.cpp

@@ -107 +107 @@
 
       // PARSING POUR GESTION DES ENFANTS
-      xml::THashAttributes attributes;
+      xml::THashAttributes attributes = node.getAttributes();
+
+      if (attributes.end() != attributes.find("src"))
+      {
+         StdIFStream ifs ( attributes["src"].c_str() , StdIFStream::in );
+         if (!ifs.good())
+            ERROR("CContext::parse(xml::CXMLNode & node)",
+                  << "[ filename = " << attributes["src"] << " ] Bad xml stream !");
+         xml::CXMLParser::ParseInclude(ifs, *this);
+      }
 
       if (node.getElementName().compare(CContext::GetName()))

XMLIO_V2/dev/dev_rv/src/xmlio/node/domain.cpp

@@ -519 +519 @@
                       ni_cl = iend_sub[k] - ibegin_sub[k] + 1;
                       
-            for (int i = zoom_ibegin_cl - 1; i < zoom_ibegin_cl + zoom_ni_cl - 1; i++)
+            for (int i = 0; i < zoom_ni_cl; i++)
             {
-               for (int j = zoom_jbegin_cl-1; j < zoom_jbegin_cl + zoom_nj_cl - 1; j++)
+               for (int j = 0; j < zoom_nj_cl; j++)
                {
-                  int ii = i - (ibegin_serv - 1) + (zoom_ibegin_cl - 1) - (ibegin_zoom_srv - 1);
-                  int jj = j - (jbegin_serv - 1) + (zoom_jbegin_cl - 1) - (jbegin_zoom_srv - 1);
+                  int ii = i /*- (ibegin_serv - 1)*/ + (zoom_ibegin_cl - 1) - (ibegin_zoom_srv - 1);
+                  int jj = j /*- (jbegin_serv - 1)*/ + (zoom_jbegin_cl - 1) - (jbegin_zoom_srv - 1);
                   (*lonvalue_temp)[ii + jj * zoom_ni_serv] =
-                  (*lonvalue_loc)[i + j * ni_cl];              
+                  (*lonvalue_loc)[i + j * zoom_ni_cl];
                   (*latvalue_temp)[ii + jj * zoom_ni_serv] = 
-                  (*latvalue_loc)[i + j * ni_cl];
+                  (*latvalue_loc)[i + j * zoom_ni_cl];
                }
             }
@@ -547 +547 @@
                       zoom_jbegin_cl = jbegin_zoom_sub[k], zoom_nj_cl = nj_zoom_sub[k];
                       
-            for (int i = zoom_ibegin_cl - 1; i < zoom_ibegin_cl + zoom_ni_cl - 1; i++)
-               (*lonvalue_temp)[i - (ibegin_serv - 1) + (zoom_ibegin_cl - 1) - (ibegin_zoom_srv - 1)] =
+            for (int i = 0; i < zoom_ni_cl; i++)
+               (*lonvalue_temp)[i /*- (ibegin_serv - 1)*/ + (zoom_ibegin_cl - 1) - (ibegin_zoom_srv - 1)] =
                (*lonvalue_loc)[i];
                
-            for (int j = zoom_jbegin_cl-1; j < zoom_jbegin_cl + zoom_nj_cl - 1; j++)
-               (*latvalue_temp)[j - (jbegin_serv - 1) + (zoom_jbegin_cl - 1) - (jbegin_zoom_srv - 1)] =
+            for (int j = 0; j < zoom_nj_cl; j++)
+               (*latvalue_temp)[j /*- (jbegin_serv - 1)*/ + (zoom_jbegin_cl - 1) - (jbegin_zoom_srv - 1)] =
                (*latvalue_loc)[j];
          }       

XMLIO_V2/dev/dev_rv/src/xmlio/node/grid.cpp

@@ -477 +477 @@
             (*storeIndex_srv)[n]  = (*storeIndex_cl)[m]; // Faux mais inutile dans le cas serveur.
             (*out_i_index_srv)[n] = (*out_i_index_cl)[m] 
-                                  /*+ (ibegin_cl - 1)*/ - (ibegin_srv - 1) + (ibegin_zoom_cl - 1) - (ibegin_zoom_srv - 1); 
+                                  /*+ (ibegin_cl - 1) - (ibegin_srv - 1)*/ + (ibegin_zoom_cl - 1) - (ibegin_zoom_srv - 1);
             (*out_j_index_srv)[n] = (*out_j_index_cl)[m]
-                                  /*+ (jbegin_cl - 1)*/ - (jbegin_srv - 1) + (jbegin_zoom_cl - 1) - (jbegin_zoom_srv - 1);
+                                  /*+ (jbegin_cl - 1) - (jbegin_srv - 1)*/ + (jbegin_zoom_cl - 1) - (jbegin_zoom_srv - 1);
             (*out_l_index_srv)[n] = (*out_l_index_cl)[m];
          }

XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.cpp

@@ -77 +77 @@
          StdString lonid     = StdString("lon_").append(domid);
          StdString latid     = StdString("lat_").append(domid);
-         StdString lonid_loc = StdString("lon_").append(domid).append("_local");
-         StdString latid_loc = StdString("lat_").append(domid).append("_local");
+         StdString lonid_loc = (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+                             ? StdString("lon_").append(domid).append("_local")
+                             : lonid;
+         StdString latid_loc = (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+                             ? StdString("lat_").append(domid).append("_local")
+                             : latid;
          StdString maskid    = StdString("mask_").append(domid).append("_local");
 
@@ -86 +90 @@
          bool isCurvilinear = (domain->lonvalue.getValue()->size() == ssize);
 
-         SuperClassWriter::addDimension(lonid, domain->ni_glo.getValue());
-         SuperClassWriter::addDimension(latid, domain->nj_glo.getValue());
+         if (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+         {
+            SuperClassWriter::addDimension(lonid, domain->zoom_ni.getValue());
+            SuperClassWriter::addDimension(latid, domain->zoom_nj.getValue());
+         }
 
          if (isCurvilinear)
@@ -229 +236 @@
          StdString lonid     = StdString("lon_").append(domid);
          StdString latid     = StdString("lat_").append(domid);
-         StdString lonid_loc = StdString("lon_").append(domid).append("_local");
-         StdString latid_loc = StdString("lat_").append(domid).append("_local");
+         StdString lonid_loc = (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+                             ? StdString("lon_").append(domid).append("_local")
+                             : lonid;
+         StdString latid_loc = (comm::CMPIManager::GetCommSize(CXIOSManager::Comm_Server) > 1)
+                             ? StdString("lat_").append(domid).append("_local")
+                             : latid;
          StdString fieldid   = (!field->name.isEmpty())
                              ? field->name.getValue() : field->getBaseFieldReference()->getId();

XMLIO_V2/dev/dev_rv/src/xmlio/xml_node.cpp

@@ -11 +11 @@
       CXMLNode::CXMLNode(rapidxml::xml_node<char> * const root)
          : node(root)
+         , level(0)
       { /* Ne rien faire de plus */ }
 
@@ -48 +49 @@
                else if (nextElement->type() == rapidxml::node_element)
                { 
-                  node = nextElement; 
+                  node = nextElement;
+                  level++;
                   return (!retvalue); 
                }
@@ -59 +61 @@
       {
          bool retvalue = false;
-         if (!(this->getElementName().compare(CXMLNode::RootName)))
+         if (!(this->getElementName().compare(CXMLNode::RootName)) || (level == 0))
             return (retvalue);
          node = node->parent();
+         level--;
          return (!retvalue);
       }

XMLIO_V2/dev/dev_rv/src/xmlio/xml_node.hpp

@@ -46 +46 @@
 
             rapidxml::xml_node<char> * node;
+            int level;
 
             static StdString RootName;

XMLIO_V2/dev/dev_rv/src/xmlio/xml_parser.cpp

@@ -1 +1 @@
 #include "xml_parser.hpp"
+
+#include "context.hpp"
 
 #include "attribute_template_impl.hpp"
@@ -12 +14 @@
 
       void CXMLParser::ParseFile(const StdString & filename)
-      { StdIFStream ifs ( filename.c_str() , StdIFStream::in );
-        CXMLParser::ParseStream(ifs); }
+      {
+         StdIFStream ifs ( filename.c_str() , StdIFStream::in );
+         CXMLParser::ParseStream(ifs);
+      }
 
       void CXMLParser::ParseString(const StdString & xmlContent)
@@ -86 +90 @@
          }
       }
+
    }// namespace xml
 } // namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/xml_parser.hpp

@@ -4 +4 @@
 /// xmlioserver headers ///
 #include "xmlioserver_spl.hpp"
+#include "exception.hpp"
 #include "xml_node.hpp"
-#include "context.hpp"
+
 
 namespace xmlioserver
@@ -19 +20 @@
             static void ParseString(const StdString & xmlContent);
             static void ParseStream(StdIStream & stream);
+            template <class T>
+               static inline void ParseInclude(StdIStream & stream, T & object);
 
       }; //class CXMLParser
+
+      template <class T>
+         void CXMLParser::ParseInclude(StdIStream & stream, T& object)
+      {
+         StdOStringStream oss;
+         while(!stream.eof() && !stream.fail ())
+            oss.put(stream.get());
+         try
+         {
+            const StdString xmlcontent( oss.str(), 0, oss.str().size()-1 );
+            rapidxml::xml_document<char> doc;
+            doc.parse<0>(const_cast<char*>(xmlcontent.c_str()));
+            CXMLNode node(doc.first_node());
+            object.parse(node);
+         }
+         catch (rapidxml::parse_error & exc)
+         {
+            ERROR("CXMLParser::ParseStream(StdIStream & stream)",
+                  << "RapidXML error : " << exc.what() << " !");
+         }
+      }
 
    }// namespace xml