- Add HostName to resource's informations

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
index 0b85c6bfb8286167c4f141a5b0f0b1ff2b395c5a..659b3162a15cf729c53c17605bd15b4badf23d66 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
@@ -123,6 +123,7 @@ void SALOME_ResourcesCatalog_Handler::ProcessXmlDocument(xmlDocPtr theDoc)
             {
              xmlChar* hostname = xmlGetProp(aCurNode, (const xmlChar*)test_hostname);
              _resource.DataForSort._hostName = (const char*)hostname;
+             _resource.HostName = (const char*)hostname;
               xmlFree(hostname);
             }
          else

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
index e20dbfc6ae8b05de06f37f66d174aa8b0a2b142d..d0a75adb8bfafe1fb79162307d34c095a9f4362f 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
@@ -116,7 +116,7 @@ void ParserResourcesType::Print() const
 {
   ostringstream oss;
   oss << endl <<
-    "HostName : " << DataForSort._hostName << endl << 
+    "HostName : " << HostName << endl << 
     "Alias : " << Alias << endl <<
     "NbOfNodes : " << DataForSort._nbOfNodes << endl <<
     "NbOfProcPerNode : " << DataForSort._nbOfProcPerNode << endl <<
@@ -145,6 +145,7 @@ void ParserResourcesType::Clear()
   DataForSort._nbOfProcPerNode = 1;
   DataForSort._CPUFreqMHz = 0;
   DataForSort._memInMB = 0;
+  HostName = "";
   Alias = "";
   Protocol = rsh;
   Mode = interactive;

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
index f8af1dbcdecf0635b0cf4d32f530a9498f7cc4b5..975ca4b30ba8b6198244b00222b2fb665928f1fc 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
@@ -73,6 +73,7 @@ class ResourceDataToSort
 struct ParserResourcesType
   {
     ResourceDataToSort DataForSort;
+    std::string HostName;
     std::string Alias;
     AccessProtocolType Protocol;
     AccessModeType Mode;

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index ea88da8f8de8b99f184482e23d9734fc8d62fd65..55b71c8a18af7fc8a32ca6b30a4339f4c67d90a6 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -1154,7 +1154,7 @@ Engines::MachineParameters* SALOME_ResourcesManager::GetMachineParameters(const
   ParserResourcesType resource = _resourcesList[string(hostname)];
   Engines::MachineParameters *p_ptr = new Engines::MachineParameters;
   p_ptr->container_name = CORBA::string_dup("");
-  p_ptr->hostname = CORBA::string_dup("hostname");
+  p_ptr->hostname = CORBA::string_dup(resource.HostName.c_str());
   p_ptr->alias = CORBA::string_dup(resource.Alias.c_str());
   if( resource.Protocol == rsh )
     p_ptr->protocol = "rsh";