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

Timestamp:

12/11/18 13:22:07 (6 years ago)

Author:

oabramkina

Message:

Exception handling on trunk.

To activate it, compilation flag -DXIOS_EXCEPTION should be added.

File:

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

XIOS/trunk/src/xml_parser.cpp

@@ -14 +14 @@
 
       void CXMLParser::ParseFile(const StdString & filename, const std::set<StdString>& parseContextList)
+      TRY
       {
          StdIFStream ifs ( filename.c_str() , StdIFStream::in );
@@ -22 +23 @@
          CXMLParser::ParseStream(ifs, filename, parseContextList);
       }
+      CATCH
 
       void CXMLParser::ParseString(const StdString & xmlContent)
@@ -54 +56 @@
             std::set<StdString>::const_iterator itE = parseContextList.end();
             bool isParseAll = (parseContextList.empty());
-            if (node.goToChildElement())
+            try
             {
-               do
-               {
-                  CContextGroup* group_context = CContext::getRoot() ;
+              if (node.goToChildElement())
+              {
+                 do
+                 {
+                    CContextGroup* group_context = CContext::getRoot() ;
 
-                  attributes = node.getAttributes();
+                    attributes = node.getAttributes();
 
-                  if (attributes.end() == attributes.find("id"))
-                  {
-                     DEBUG("The context will not be processed because it is not identified (missing id)");
-                     continue;
-                  }
+                    if (attributes.end() == attributes.find("id"))
+                    {
+                       DEBUG("The context will not be processed because it is not identified (missing id)");
+                       continue;
+                    }
 
-                  CContext::setCurrent(attributes["id"]) ;
+                    CContext::setCurrent(attributes["id"]) ;
 
-
-                  if (isParseAll)
-                  {
-                    CContext* context = CContext::create(attributes["id"]);
-                    context->parse(node);
-
-                    attributes.clear();
-                  }
-                  else
-                  {
-                    it = parseContextList.find(attributes["id"]);
-                    if (itE != it)
+                    if (isParseAll)
                     {
-                      CContext* context = CContext::create(*it);
+                      CContext* context = CContext::create(attributes["id"]);
                       context->parse(node);
 
                       attributes.clear();
                     }
-                  }
-               } while (node.goToNextElement());
+                    else
+                    {
+                      it = parseContextList.find(attributes["id"]);
+                      if (itE != it)
+                      {
+                        CContext* context = CContext::create(*it);
+                        context->parse(node);
+
+                        attributes.clear();
+                      }
+                    }
+                 } while (node.goToNextElement());
+              }
             }
+            catch(CException& e)
+            {
+              CException::StackInfo stk;
+              stk.info.append("Exception occurred while parsing XML file \"");
+              stk.info.append(attributes["src"]);
+              stk.info.append("\".\n");
+              stk.file = FILE_NAME;
+              stk.function = FUNCTION_NAME;
+              stk.line = __LINE__;
+              e.stack.push_back(stk);
+              if (CXios::xiosStack)
+                throw;
+             else
+               throw 0;
+            }
+            catch(...)
+            {
+              CException exc;
+              CException::StackInfo stk;
+              stk.info.append("Exception occurred while parsing XML file \"");
+              stk.info.append(attributes["src"]);
+              stk.info.append("\".\n");
+              stk.file = FILE_NAME;
+              stk.function = FUNCTION_NAME;
+              stk.line = __LINE__;
+              exc.stack.push_back(stk);
+              if (CXios::xiosStack)
+                throw exc;
+             else
+               throw 0;
+            }
+
          }
          catch (rapidxml::parse_error & exc)
@@ -110 +146 @@
                   << "Error is occuring when parsing XML flux from <"<<fluxId<<"> at character "<< pos<<" line "<<lineNumber<<" column "<< columnNumber<< endl
                   << strLine<<endl
-                  << string(columnNumber-1,'x')<<'^'<<endl
-                  <<" Error : " << exc.what() )
+                  << string(columnNumber-1,'x')<<'^'<<endl)
+//                  <<" Error : " << exc.what() )
          }
       }