From: barate <barate>
Date: Fri, 11 Oct 2013 16:05:00 +0000 (+0000)
Subject: Launcher persistence layer does not depend on libbatch anymore
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=253588fe9628aff1f36da06b0a4ae2e339df5f71;p=modules%2Fyacs.git

Launcher persistence layer does not depend on libbatch anymore
---

diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index 0d905d8d7..cda4fb392 100644
--- a/src/Launcher/Launcher.cxx
+++ b/src/Launcher/Launcher.cxx
@@ -146,6 +146,7 @@ Launcher_cpp::launchJob(int job_id)
     Batch::JobId batch_manager_job_id = _batchmap[job_id]->submitJob(*(job->getBatchJob()));
     job->setBatchManagerJobId(batch_manager_job_id);
     job->setState("QUEUED");
+    job->setReference(batch_manager_job_id.getReference());
   }
   catch(const Batch::GenericException &ex)
   {
diff --git a/src/Launcher/Launcher_Job.hxx b/src/Launcher/Launcher_Job.hxx
index e2674c6e5..41005e303 100644
--- a/src/Launcher/Launcher_Job.hxx
+++ b/src/Launcher/Launcher_Job.hxx
@@ -155,7 +155,7 @@ namespace Launcher
       std::string _queue;
       bool _exclusive;
       unsigned long _mem_per_cpu;
-      std::string _reference;
+      std::string _reference; //! Reference of the job for the batch manager
 
 	  // Parameters for COORM
 	  std::string _launcher_file;
diff --git a/src/Launcher/Launcher_XML_Persistence.cxx b/src/Launcher/Launcher_XML_Persistence.cxx
index 511ffd223..547ea8d1d 100644
--- a/src/Launcher/Launcher_XML_Persistence.cxx
+++ b/src/Launcher/Launcher_XML_Persistence.cxx
@@ -612,11 +612,7 @@ XML_Persistence::addJobToXmlDocument(xmlNodePtr root_node, const Job & job)
   xmlNewChild(run_node, NULL, xmlCharStrdup("job_state"), xmlCharStrdup(job.getState().c_str()));
   ParserResourcesType resource_definition = job.getResourceDefinition();
   xmlNewChild(run_node, NULL, xmlCharStrdup("resource_choosed_name"), xmlCharStrdup(resource_definition.Name.c_str()));
-
-#ifdef WITH_LIBBATCH
-  Batch::JobId job_id = job.getBatchManagerJobId();
-  xmlNewChild(run_node, NULL, xmlCharStrdup("job_reference"), xmlCharStrdup(job_id.getReference().c_str()));
-#endif
+  xmlNewChild(run_node, NULL, xmlCharStrdup("job_reference"), xmlCharStrdup(job.getReference().c_str()));
 }
 
 }