Changeset 1158 for XIOS/dev/dev_olga/src/xml_parser.cpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/xml_parser.cpp (modified) (2 diffs)

XIOS/dev/dev_olga/src/xml_parser.cpp

@@ -70 +70 @@
                   CContext::setCurrent(attributes["id"]) ;
 
-                  bool hasctxt = CContext::has(attributes["id"]);
-
-                  if(hasctxt)
-                  {
-                     DEBUG("The context will not be processed because it exist an other context with the same id" );
-                     continue;
-                  }
 
                   if (isParseAll)
                   {
                     CContext* context = CContext::create(attributes["id"]);
-//                  if (!hasctxt)  group_context->addChild(context);
                     context->parse(node);
 
@@ -92 +84 @@
                     {
                       CContext* context = CContext::create(*it);
-  //                  if (!hasctxt)  group_context->addChild(context);
                       context->parse(node);