X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FResourcesManager%2FSALOME_ResourcesCatalog_Handler.hxx;h=b8880b33ba08eb1532ddeb54f3ba923b2c319c31;hb=cbeb1b9ad4789b0fe4ea7f8efcaf98f7f8fec2f6;hp=35cd212969c57a42006dd493d7115b226c9c66e1;hpb=7d2fe213bdf5bf962ce11e253020c9d3e0bc1cce;p=modules%2Fkernel.git

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.hxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.hxx
index 35cd21296..b8880b33b 100755
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME ResourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl)
 //  File   : SALOME_ResourcesCatalog_Handler.hxx
 //  Author : Estelle Deville
@@ -42,44 +43,52 @@ class RESOURCESMANAGER_EXPORT SALOME_ResourcesCatalog_Handler
 {
   
   public :
-    SALOME_ResourcesCatalog_Handler(MapOfParserResourcesType& resources_list,
-				    MapOfParserResourcesType& resources_batch_list);
+    SALOME_ResourcesCatalog_Handler(MapOfParserResourcesType& resources_list);
 
     const MapOfParserResourcesType& GetResourcesAfterParsing() const;
 
     virtual ~SALOME_ResourcesCatalog_Handler();
 
     void ProcessXmlDocument(xmlDocPtr theDoc);
+
+    bool ProcessMachine(xmlNodePtr machine_descr, ParserResourcesType & resource);
+    bool ProcessCluster(xmlNodePtr cluster_descr, ParserResourcesType & resource);
+    bool ProcessMember(xmlNodePtr member_descr, ParserResourcesClusterMembersType & resource);
   
     void PrepareDocToXmlFile(xmlDocPtr theDoc);
 
   private :
-    std::string previous_module_name;
+    std::string previous_component_name;
 
     ParserResourcesType _resource;
     MapOfParserResourcesType& _resources_list;
-    MapOfParserResourcesType& _resources_batch_list;
 
     const char *test_machine;
-    const char *test_resources;
-
+    const char *test_cluster;
+    const char *test_name;
     const char *test_hostname;
-    const char *test_alias;
     const char *test_protocol;
+    const char *test_cluster_internal_protocol;
     const char *test_mode;
     const char *test_batch;
     const char *test_mpi;
     const char *test_user_name;
     const char *test_appli_path;
+    // for compatibility
     const char *test_modules;
     const char *test_module_name;
+    const char *test_components;
+    const char *test_component_name;
     const char *test_os;
     const char *test_mem_in_mb;
     const char *test_cpu_freq_mhz;
     const char *test_nb_of_nodes;
+    const char *test_nb_of_proc;
     const char *test_nb_of_proc_per_node;
     const char *test_batch_queue;
     const char *test_user_commands;
+    const char *test_use;
+    const char *test_members;
 
   };