NRI : Fixed bug SUPERV5830.

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx
index 084c4c12f52b66124daabfbb8df32eba7aeb3074..4cf8e579a929064a1bbd95d957798df105361f6c 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.cxx
@@ -462,6 +462,9 @@ void SALOME_ModuleCatalog_AcomponentImpl::duplicate
 (SALOME_ModuleCatalog::Service & S_out,
  const SALOME_ModuleCatalog::Service &S_in)
 {
+  // type of node
+  S_out.TypeOfNode = S_in.TypeOfNode;
+
     // duplicate service name
   S_out.ServiceName = CORBA::string_dup(S_in.ServiceName);
   

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
index de670dd8f0fcb49ccdc821bcbbfc5425d35da1d5..5af547b2e452606b410b6fecce3393d38fd57328 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.cxx
@@ -237,6 +237,10 @@ bool SALOME_ModuleCatalog_Handler::endElement(const QString&,
     return true;
    }
 
+   // tag test_component_impltype
+  if((qName.compare(QString(test_component_impltype))==0)) 
+    _aModule.implementationType = atoi(content.c_str()) ;
+
   // tag test_component_icon
    if((qName.compare(test_component_icon)==0)) {
      _aModule.icon = content ;
@@ -265,6 +269,10 @@ bool SALOME_ModuleCatalog_Handler::endElement(const QString&,
      return true;
    }
 
+   //tag test_typeofnode
+   if((qName.compare(QString(test_typeofnode))==0))
+     _aService.typeOfNode = atoi(content.c_str()) ;
+
    // Parameter in
 
    // tag test_inDataStreamParameter_type
@@ -450,6 +458,7 @@ bool SALOME_ModuleCatalog_Handler::endElement(const QString&,
 
        // Empty temporary structures
        _aService.name = "";
+       _aService.typeOfNode = 1;
        _aService.inParameters.resize(0);
        _aService.outParameters.resize(0);
        _aService.inDataStreamParameters.resize(0);

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
index 0e6ae2ef79c660db7b44f1954f23c7b710ce7331..7ba1b29f9539881e57c8e1b65380afcdcdce7c0f 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
@@ -646,6 +646,8 @@ void SALOME_ModuleCatalogImpl::duplicate
   // duplicate service by default
   S_corba.Servicebydefault = S_parser.byDefault;
 
+  S_corba.TypeOfNode = S_parser.typeOfNode;
+
   unsigned int _length;
 
   // duplicate in Parameters