AR with GD: Can now load SALOME jobs

diff --git a/src/Launcher/Launcher.hxx b/src/Launcher/Launcher.hxx
index 662112034d256d93391356b44382fc707afa344a..57aabac596c0bb174f149d6cfad584edd1947f8e 100644 (file)
--- a/src/Launcher/Launcher.hxx
+++ b/src/Launcher/Launcher.hxx
@@ -73,6 +73,8 @@ public:
   // Lib methods
   void SetResourcesManager( ResourcesManager_cpp* rm ) {_ResManager = rm;}
 
+  // Used by SALOME_Launcher
+  ResourcesManager_cpp *_ResManager;
 protected:
 
   virtual void notifyObservers(const std::string & event_name, const std::string & event_data) {}
@@ -84,7 +86,6 @@ protected:
 #endif
   ParserLauncherType ParseXmlFile(std::string xmlExecuteFile);
 
-  ResourcesManager_cpp *_ResManager;
   std::map <int, Launcher::Job *> _launcher_job_map;  
   int _job_cpt; // job number counter
   pthread_mutex_t * _job_cpt_mutex; // mutex for job counter

diff --git a/src/Launcher/SALOME_Launcher.cxx b/src/Launcher/SALOME_Launcher.cxx
index 27956bded60145793c8afe4658d8f0ff80fc0dbc..89f4e9c3ddc6ccd533453383b854b0f61a2ddc5e 100644 (file)
--- a/src/Launcher/SALOME_Launcher.cxx
+++ b/src/Launcher/SALOME_Launcher.cxx
@@ -782,8 +782,7 @@ SALOME_Launcher::loadJobs(const char* jobs_file)
             new_job->setState(job_state);
 
             // Step 3: We add the job to the launcher
-            ParserResourcesType resource_definition;
-            resource_definition.Name = resource_choosed_name;
+           ParserResourcesType resource_definition = _l._ResManager->GetResourcesDescr(resource_choosed_name);
             new_job->setResourceDefinition(resource_definition);
             _l.addJobDirectlyToMap(new_job, job_reference);
 
@@ -818,8 +817,7 @@ SALOME_Launcher::loadJobs(const char* jobs_file)
             new_job->setState(job_state);
 
             // Step 3: We add the job to the launcher
-            ParserResourcesType resource_definition;
-            resource_definition.Name = resource_choosed_name;
+           ParserResourcesType resource_definition = _l._ResManager->GetResourcesDescr(resource_choosed_name);
             new_job->setResourceDefinition(resource_definition);
             _l.addJobDirectlyToMap(new_job, job_reference);