updated copyright message

[modules/kernel.git] / src / ModuleCatalog / SALOME_ModuleCatalog_impl.cxx

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
index f6877ae3541eebcc79f5eff329765e69dc9a07aa..eeccfc0960383bfdb47204566f08b4b934802a69 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -29,6 +29,8 @@
 #include "SALOME_ModuleCatalog_impl.hxx"
 #include "SALOME_ModuleCatalog_Acomponent_impl.hxx"
 #include "SALOME_ModuleCatalog_Handler.hxx"
+#include "SALOME_Fake_NamingService.hxx"
+
 #include <libxml/parser.h>
 #include <fstream>
 #include <map>
@@ -51,15 +53,12 @@
 # include <unistd.h>
 #endif
 
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
 
 static const char* SEPARATOR     = "::";
 static const char* OLD_SEPARATOR = ":";
 
+const char SALOME_ModuleCatalogImpl::ENTRY_IN_NS[] = "/Kernel/ModulCatalog";
+
 SALOME_ModuleCatalog::ModuleCatalog_ptr KERNEL::getModuleComponentServantSA(const char *listOfCatalogs)
 {
   static SALOME_ModuleCatalog::ModuleCatalog_var moduleCata;
@@ -72,6 +71,8 @@ SALOME_ModuleCatalog::ModuleCatalog_ptr KERNEL::getModuleComponentServantSA(cons
       argv[2] = const_cast<char*>(listOfCatalogs);
     SALOME_ModuleCatalogImpl *servant = new SALOME_ModuleCatalogImpl(NB_OF_ELT_IN_CMD,argv,orb);
     moduleCata = servant->_this();
+    SALOME_Fake_NamingService NS;
+    NS.Register(moduleCata,SALOME_ModuleCatalogImpl::ENTRY_IN_NS);
   }
   return SALOME_ModuleCatalog::ModuleCatalog::_duplicate(moduleCata);
 }
@@ -207,7 +208,7 @@ public:
 SALOME_ModuleCatalogImpl::SALOME_ModuleCatalogImpl(int argc, char** argv, CORBA::ORB_ptr orb) : _orb(orb)
 {
   myPrivate = new Private;
-  if(MYDEBUG) MESSAGE("Catalog creation");
+  MESSAGE("Catalog creation");
   /* Init libxml */
   xmlInitParser();
 
@@ -246,12 +247,12 @@ SALOME_ModuleCatalogImpl::SALOME_ModuleCatalogImpl(int argc, char** argv, CORBA:
   
   // Parse the arguments given at server run
   if (!_parseArguments(argc, argv,&myPrivate->_general_path,&myPrivate->_personal_path))
-    if(MYDEBUG) MESSAGE( "Error while argument parsing" );
+    MESSAGE( "Error while argument parsing" );
 
   // Test existency of files
   if (myPrivate->_general_path == NULL)
   {
-    if(MYDEBUG) MESSAGE( "Error the general catalog should be indicated" );
+    MESSAGE( "Error the general catalog should be indicated" );
   }
   else
   {
@@ -290,11 +291,11 @@ SALOME_ModuleCatalogImpl::SALOME_ModuleCatalogImpl(int argc, char** argv, CORBA:
 
     // Verification of _general_path_list content
     if (!myPrivate->_verify_path_prefix(myPrivate->_general_path_list)) {
-      if(MYDEBUG) MESSAGE( "Error while parsing the general path list, "
+      MESSAGE( "Error while parsing the general path list, "
                            "different paths are associated to the same computer," 
                            "the first one will be chosen");
     } else {
-      if(MYDEBUG) MESSAGE("General path list OK");
+      MESSAGE("General path list OK");
     }
 
     if (myPrivate->_personal_path != NULL) {
@@ -308,14 +309,14 @@ SALOME_ModuleCatalogImpl::SALOME_ModuleCatalogImpl(int argc, char** argv, CORBA:
       
       // Verification of _general_path_list content
       if(!myPrivate->_verify_path_prefix(myPrivate->_personal_path_list)){
-        if(MYDEBUG) MESSAGE("Error while parsing the personal path list, "
+        MESSAGE("Error while parsing the personal path list, "
                             "different paths are associated to the same computer, "
                             "the first one will be chosen" );
       }else {
-        if(MYDEBUG) MESSAGE("Personal path list OK");
+        MESSAGE("Personal path list OK");
       }
     }else 
-      if(MYDEBUG) MESSAGE("No personal catalog indicated or error while "
+      MESSAGE("No personal catalog indicated or error while "
                           "opening the personal catalog");
   }
 }
@@ -326,7 +327,7 @@ SALOME_ModuleCatalogImpl::SALOME_ModuleCatalogImpl(int argc, char** argv, CORBA:
 //----------------------------------------------------------------------
 SALOME_ModuleCatalogImpl::~SALOME_ModuleCatalogImpl()
 {
-  if(MYDEBUG) MESSAGE("Catalog Destruction");
+  MESSAGE("Catalog Destruction");
   delete myPrivate;
 }
 
@@ -418,7 +419,7 @@ SALOME_ModuleCatalogImpl::GetComputerList()
 //----------------------------------------------------------------------
 char* 
 SALOME_ModuleCatalogImpl::GetPathPrefix(const char* machinename) {
-  if(MYDEBUG) MESSAGE("Begin of GetPathPrefix");
+  MESSAGE("Begin of GetPathPrefix");
   // Variables initialisation
   std::string _path;
   bool _find = false;
@@ -465,7 +466,7 @@ SALOME_ModuleCatalogImpl::GetPathPrefix(const char* machinename) {
 SALOME_ModuleCatalog::ListOfComponents* 
 SALOME_ModuleCatalogImpl::GetComponentList()
 {
-  if(MYDEBUG) MESSAGE("Begin of GetComponentList");
+  MESSAGE("Begin of GetComponentList");
   SALOME_ModuleCatalog::ListOfComponents_var _list_components = 
     new SALOME_ModuleCatalog::ListOfComponents;
 
@@ -474,7 +475,7 @@ SALOME_ModuleCatalogImpl::GetComponentList()
   // All the components defined in the personal catalog are taken
   for(unsigned int ind=0; ind < myPrivate->_personal_module_list.size();ind++){
     _list_components[ind]=(myPrivate->_personal_module_list[ind].name).c_str();
-    if(MYDEBUG) SCRUTE(_list_components[ind]) ;
+    SCRUTE(_list_components[ind]) ;
   }
 
   size_t indice = myPrivate->_personal_module_list.size();
@@ -491,21 +492,21 @@ SALOME_ModuleCatalogImpl::GetComponentList()
         _find = true;
     }
     if(!_find){
-      if(MYDEBUG) MESSAGE("A new component " << myPrivate->_general_module_list[ind].name 
+      MESSAGE("A new component " << myPrivate->_general_module_list[ind].name 
                           << " has to be to added in the list");
       _list_components->length((CORBA::ULong)indice+1);
       // The component is not already defined => has to be taken
       _list_components[(CORBA::ULong)indice]=(myPrivate->_general_module_list[ind].name).c_str();
-      if(MYDEBUG) SCRUTE(_list_components[(CORBA::ULong)indice]) ;
+      SCRUTE(_list_components[(CORBA::ULong)indice]) ;
       
       indice++;
     }else{
-      if(MYDEBUG) MESSAGE("The component " <<myPrivate->_general_module_list[ind].name 
+      MESSAGE("The component " <<myPrivate->_general_module_list[ind].name 
                           << " was already defined in the personal catalog") ;
     }
   }
   
-  if(MYDEBUG) MESSAGE ( "End of GetComponentList" );
+  MESSAGE("End of GetComponentList");
   return _list_components._retn();
 }
 
@@ -520,7 +521,7 @@ SALOME_ModuleCatalogImpl::GetComponentList()
 SALOME_ModuleCatalog::ListOfIAPP_Affich* 
 SALOME_ModuleCatalogImpl::GetComponentIconeList()
 {
-  if(MYDEBUG) MESSAGE("Begin of GetComponentIconeList");
+  MESSAGE("Begin of GetComponentIconeList");
 
   SALOME_ModuleCatalog::ListOfIAPP_Affich_var _list_components_icone = 
     new SALOME_ModuleCatalog::ListOfIAPP_Affich;
@@ -534,8 +535,8 @@ SALOME_ModuleCatalogImpl::GetComponentIconeList()
     _list_components_icone[ind].moduleicone=(myPrivate->_personal_module_list[ind].icon).c_str();
     _list_components_icone[ind].moduleversion=(myPrivate->_personal_module_list[ind].version).c_str();
     _list_components_icone[ind].modulecomment=(myPrivate->_personal_module_list[ind].comment).c_str();
-    //if(MYDEBUG) SCRUTE(_list_components_icone[ind].modulename); 
-    //if(MYDEBUG) SCRUTE(_list_components_icone[ind].moduleicone);
+    //SCRUTE(_list_components_icone[ind].modulename); 
+    //SCRUTE(_list_components_icone[ind].moduleicone);
   }
   
   size_t indice = myPrivate->_personal_module_list.size();
@@ -552,7 +553,7 @@ SALOME_ModuleCatalogImpl::GetComponentIconeList()
         _find = true;
     }
     if(!_find){
-      //          if(MYDEBUG) MESSAGE("A new component " << _general_module_list[ind].name << " has to be to added in the list");
+      //MESSAGE("A new component " << _general_module_list[ind].name << " has to be to added in the list");
       _list_components_icone->length((CORBA::ULong)indice+1);
       // The component is not already defined => has to be taken
       _list_components_icone[(CORBA::ULong)indice].modulename=myPrivate->_general_module_list[ind].name.c_str();  
@@ -560,13 +561,13 @@ SALOME_ModuleCatalogImpl::GetComponentIconeList()
       _list_components_icone[(CORBA::ULong)indice].moduleicone=myPrivate->_general_module_list[ind].icon.c_str(); 
       _list_components_icone[(CORBA::ULong)indice].moduleversion=myPrivate->_general_module_list[ind].version.c_str();
       _list_components_icone[(CORBA::ULong)indice].modulecomment=myPrivate->_general_module_list[ind].comment.c_str();
-      //if(MYDEBUG) SCRUTE(_list_components_icone[(CORBA::ULong)indice].modulename) ;
-      //if(MYDEBUG) SCRUTE(_list_components_icone[(CORBA::ULong)indice].moduleicone);
+      //SCRUTE(_list_components_icone[(CORBA::ULong)indice].modulename) ;
+      //SCRUTE(_list_components_icone[(CORBA::ULong)indice].moduleicone);
       
       indice++;
     }
     // else 
-    //if(MYDEBUG) MESSAGE("The component " <<_general_module_list[ind].name << " was already defined in the personal catalog"); 
+    //MESSAGE("The component " <<_general_module_list[ind].name << " was already defined in the personal catalog"); 
   }
   
   return _list_components_icone._retn() ;
@@ -582,7 +583,7 @@ SALOME_ModuleCatalogImpl::GetComponentIconeList()
 SALOME_ModuleCatalog::ListOfComponents* 
 SALOME_ModuleCatalogImpl::GetTypedComponentList(SALOME_ModuleCatalog::ComponentType component_type)
 {
-  if(MYDEBUG) MESSAGE("Begin of GetTypedComponentList");
+  MESSAGE("Begin of GetTypedComponentList");
   SALOME_ModuleCatalog::ListOfComponents_var _list_typed_component = 
     new SALOME_ModuleCatalog::ListOfComponents;
   int _j = 0;
@@ -624,7 +625,7 @@ SALOME_ModuleCatalogImpl::GetTypedComponentList(SALOME_ModuleCatalog::ComponentT
         {
           _list_typed_component->length(_j + 1); 
            _list_typed_component[_j] = myPrivate->_personal_module_list[ind].name.c_str();
-          //if(MYDEBUG) SCRUTE(_list_typed_component[_j]);
+          //SCRUTE(_list_typed_component[_j]);
           _j++;
         }
     }
@@ -649,16 +650,16 @@ SALOME_ModuleCatalogImpl::GetTypedComponentList(SALOME_ModuleCatalog::ComponentT
             }
           if (!_find)
             {
-              //if(MYDEBUG) MESSAGE("A new component " << _general_module_list[ind].name << " has to be to added in the list");
+              //MESSAGE("A new component " << _general_module_list[ind].name << " has to be to added in the list");
               _list_typed_component->length(indice+1);
               // The component is not already defined => has to be taken
               _list_typed_component[indice]=(myPrivate->_general_module_list[ind].name).c_str();   
-              //if(MYDEBUG) SCRUTE(_list_typed_component[indice]) ;
+              //SCRUTE(_list_typed_component[indice]) ;
 
               indice++;
             }
           //else 
-            //if(MYDEBUG) MESSAGE("The component " <<_general_module_list[ind].name << " was already defined in the personal catalog") ;
+            //MESSAGE("The component " <<_general_module_list[ind].name << " was already defined in the personal catalog") ;
         }
     }
 
@@ -706,7 +707,7 @@ SALOME_ModuleCatalogImpl::GetComponent(const char* name)
   else {
     // Not found in the personal catalog and in the general catalog
     // return NULL object
-    if(MYDEBUG) MESSAGE("Component with name  " << name 
+    MESSAGE("Component with name  " << name 
                         << " not found in catalog");
   }
   
@@ -811,7 +812,7 @@ SALOME_ModuleCatalogImpl::Private::findComponent(const std::string & name)
       {
         if (name.compare(_personal_module_list[ind].name) == 0)
           {
-            if(MYDEBUG) MESSAGE("Component named " << name 
+            MESSAGE("Component named " << name 
                                 << " found in the personal catalog");
             C_parser = &(_personal_module_list[ind]);
             break;
@@ -823,7 +824,7 @@ SALOME_ModuleCatalogImpl::Private::findComponent(const std::string & name)
       {
         if (name.compare(_general_module_list[ind].name) == 0)
           {
-            //      if(MYDEBUG) MESSAGE("Component named " << name 
+            //MESSAGE("Component named " << name 
             //                  << " found in the general catalog");
             C_parser = &(_general_module_list[ind]);
             break;
@@ -844,8 +845,8 @@ SALOME_ModuleCatalogImpl::Private::_parse_xml_file(const char* file,
                                                   ParserTypes& typeMap,
                                                   TypeList& typeList)
 {
-  if(MYDEBUG) BEGIN_OF("_parse_xml_file");
-  if(MYDEBUG) SCRUTE(file);
+  BEGIN_OF("_parse_xml_file");
+  SCRUTE(file);
 
   //Local path and module list for the file to parse
   ParserPathPrefixes  _pathList;
@@ -952,7 +953,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate
   
   // duplicate service list
   size_t _length = I_parser.services.size();
-  //  if(MYDEBUG) SCRUTE(_length);
+  //  SCRUTE(_length);
   //  I_corba.interfaceservicelist 
   //  = new SALOME_ModuleCatalog::ListOfInterfaceService;
   I_corba.interfaceservicelist.length((CORBA::ULong)_length);
@@ -1006,7 +1007,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate
   
   // duplicate out DataStreamParameters
   _length = S_parser.outDataStreamParameters.size();
-  //  if(MYDEBUG) SCRUTE(_length);
+  //  SCRUTE(_length);
   S_corba.ServiceoutDataStreamParameter.length((CORBA::ULong)_length);
 
   for (unsigned int ind2 = 0; ind2 < _length ; ind2 ++)
@@ -1056,7 +1057,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate
 
   // duplicate parameter dependency
   
-  if(MYDEBUG) SCRUTE(P_parser.dependency);
+  SCRUTE(P_parser.dependency);
   P_corba.Parameterdependency = SALOME_ModuleCatalog::DATASTREAM_UNDEFINED;
   for (it_dep = DataStreamDepConvert.begin(); 
        it_dep != DataStreamDepConvert.end(); 
@@ -1066,7 +1067,7 @@ void SALOME_ModuleCatalogImpl::Private::duplicate
       break;
     }
 
-  if(MYDEBUG) SCRUTE(P_corba.Parameterdependency);
+  SCRUTE(P_corba.Parameterdependency);
 }
 
 //----------------------------------------------------------------------
@@ -1109,7 +1110,7 @@ SALOME_ModuleCatalogImpl::Private::_verify_path_prefix(ParserPathPrefixes & path
        {
          if(_machine_list[ind].compare(_machine_list[ind1]) == 0)
            {
-             if(MYDEBUG) MESSAGE( "The computer " << _machine_list[ind] << " is indicated more than once in the path list");
+             MESSAGE( "The computer " << _machine_list[ind] << " is indicated more than once in the path list");
              _return_value = false; 
            }
        }