NRI : Merge from V1_2.

[modules/superv.git] / src / GraphBase / DataFlowBase_XmlHandler.cxx

diff --git a/src/GraphBase/DataFlowBase_XmlHandler.cxx b/src/GraphBase/DataFlowBase_XmlHandler.cxx
index 4b26c8af5baf1ec72429feab69414f19ffecdf8b..9330837d4544013b78f392ebcdd1bfff9fba0763 100644 (file)
--- a/src/GraphBase/DataFlowBase_XmlHandler.cxx
+++ b/src/GraphBase/DataFlowBase_XmlHandler.cxx
@@ -1,19 +1,32 @@
-using namespace std;
-//=============================================================================
-//  File      : DataFlowBase_XmlHandler.cxx
-//  Created   : Thu Sept 13 14:20:36 2001
-//  Author    : Arnaud RES
-//  Project   : SALOME
-//  Copyright : CEA
+//  SUPERV GraphBase : contains fondamental classes for Services, Input Ports, Output Ports Links and Nodes.
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : DataFlowBase_XmlHandler.cxx
+//  Author : Arnaud RES
+//  Module : SUPERV
 //  $Header$
 
-//#include "SALOME_NamingService.hxx"
-
-//#include <SALOMEconfig.h>
-//#include CORBA_CLIENT_HEADER(SALOME_SuperVision)
-
-//#include "DataFlow_debug.hxx"
-
+using namespace std;
 #include "DataFlowBase_XmlHandler.hxx"
 
 #include <qstring.h>
@@ -658,7 +671,8 @@ bool GraphBase::XmlHandler::endElement( const QString&,
               break;
            }
             case CORBA::tk_objref: {
-              aLink.aLinkValue.replace(CORBA::_tc_Object, NULL);
+//              aLink.aLinkValue.replace(CORBA::_tc_Object, NULL);
+              aLink.aLinkValue <<= CORBA::Object::_nil() ;
 #if TRACE
               MESSAGE( " (object reference)" );
 #endif
@@ -899,7 +913,12 @@ bool GraphBase::XmlHandler::endElement( const QString&,
               return returnfalse( this , "depth5-8" , qName ) ;
             int l = aNode.theListOfFuncName.size() ;
             aNode.theListOfFuncName.resize( l+1 ) ;
-            aNode.theListOfFuncName[ l ] = fieldvalue[depth].c_str() ;
+            if ( strcmp( fieldvalue[depth].c_str() , "?" ) ) {
+              aNode.theListOfFuncName[ l ] = fieldvalue[depth].c_str() ;
+           }
+            else {
+              aNode.theListOfFuncName[ l ] = "" ;
+           }
             aNode.theListOfPythonFunctions.resize( l+1 ) ;
             aNode.theListOfPythonFunctions[ l ] = new SUPERV::ListOfStrings() ;
 #if TRACE