Changeset 509 for XIOS/trunk/src/xml_parser.cpp

Timestamp:

11/13/14 15:09:14 (9 years ago)

Author:

mhnguyen

Message:

Implementing buffer size auto-detection for mode client -server

+) Process xml tree in client side then send all the information to server
+) Only information enabled fields in enabled files are sent to server
+) Some important change in structure of code which must be refactored

Test
+) On Curie
+) Only mode client-server
+) Passed for all tests

File:

• XIOS/trunk/src/xml_parser.cpp (modified) (7 diffs)

XIOS/trunk/src/xml_parser.cpp

@@ -13 +13 @@
       /// ////////////////////// Définitions ////////////////////// ///
 
-      void CXMLParser::ParseFile(const StdString & filename)
+      void CXMLParser::ParseFile(const StdString & filename, const std::set<StdString>& parseContextList)
       {
          StdIFStream ifs ( filename.c_str() , StdIFStream::in );
@@ -20 +20 @@
                   <<endl<< "Can not open <"<<filename<<"> file" );
 
-         CXMLParser::ParseStream(ifs, filename);
+         CXMLParser::ParseStream(ifs, filename, parseContextList);
       }
 
@@ -26 +26 @@
       {
          StdIStringStream iss ( xmlContent /*, StdIStringStream::in*/ );
-         CXMLParser::ParseStream(iss,"string");
+         std::set<StdString> contxtList;
+         CXMLParser::ParseStream(iss,"string", contxtList);
       }
 
-      void CXMLParser::ParseStream(StdIStream & stream, const string& fluxId)
+      void CXMLParser::ParseStream(StdIStream & stream, const string& fluxId, const std::set<StdString>& parseContextList)
       {
          if (!stream.good())
@@ -50 +51 @@
                      << node.getElementName() << "\')!");
 
+            std::set<StdString>::iterator it;
+            std::set<StdString>::const_iterator itE = parseContextList.end();
+            bool isParseAll = (parseContextList.empty());
             if (node.goToChildElement())
             {
@@ -55 +59 @@
                {
                   CContextGroup* group_context = CContext::getRoot() ;
- 
+
                   attributes = node.getAttributes();
 
                   if (attributes.end() == attributes.find("id"))
-                  {  
+                  {
                      DEBUG("The context will not be processed because it is not identified (missing id)");
-                     continue; 
+                     continue;
                   }
 
@@ -69 +73 @@
 
                   if(hasctxt)
-                  {  
+                  {
                      DEBUG("The context will not be processed because it exist an other context with the same id" );
-                     continue; 
+                     continue;
                   }
 
-                  CContext* context = CContext::create(attributes["id"]);
+                  if (isParseAll)
+                  {
+                    CContext* context = CContext::create(attributes["id"]);
 //                  if (!hasctxt)  group_context->addChild(context);
-                  context->parse(node);
+                    context->parse(node);
 
-                  attributes.clear();
+                    attributes.clear();
+                  }
+                  else
+                  {
+                    it = parseContextList.find(attributes["id"]);
+                    if (itE != it)
+                    {
+                      CContext* context = CContext::create(*it);
+  //                  if (!hasctxt)  group_context->addChild(context);
+                      context->parse(node);
 
+                      attributes.clear();
+                    }
+                  }
                } while (node.goToNextElement());
             }
@@ -93 +111 @@
             const char* line;
             const char* endLine;
-            
+
             for(const char* i=content;i<content+pos; ++i, ++columnNumber) if (*i=='\n') { lineNumber++ ; line=i ; columnNumber=0 ;}
             for(endLine=content+pos; *endLine!='\n' && *endLine!='\0' ; ++endLine) ;
             string strLine(line,endLine-line) ;
-                  
+
             ERROR("CXMLParser::ParseStream(StdIStream & stream)", << endl
                   << "Error is occuring when parsing XML flux from <"<<fluxId<<"> at character "<< pos<<" line "<<lineNumber<<" column "<< columnNumber<< endl