Skip to content
Snippets Groups Projects
Commit 9ce33566 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

onelab

parent 44ef70fe
No related branches found
No related tags found
No related merge requests found
...@@ -109,16 +109,25 @@ bool onelab::localNetworkClient::run() ...@@ -109,16 +109,25 @@ bool onelab::localNetworkClient::run()
std::string command = FixWindowsPath(_commandLine); std::string command = FixWindowsPath(_commandLine);
if(command.size()){ if(command.size()){
// FIXME hack for getdp: this should be removed // complete the command line if "UseCommandLine" is set in the database
std::vector<onelab::number> n;
get(n, getName() + "/UseCommandLine");
if(n.size() && n[0].getValue()){
std::vector<onelab::string> ps; std::vector<onelab::string> ps;
get(ps, getName() + "/1ModelName");
if(ps.size()) command += " " + ps[0].getValue();
get(ps, getName() + "/Action"); get(ps, getName() + "/Action");
if(ps.size() && ps[0].getValue() == "compute"){ std::string action = (ps.empty() ? "" : ps[0].getValue());
get(ps, getName() + "/9Compute"); get(ps, getName() + "/1ModelName");
if(ps.size()) command += " " + ps[0].getValue(); std::string modelName = (ps.empty() ? "" : ps[0].getValue());
} get(ps, getName() + "/9CheckCommand");
// end hack for getdp std::string checkCommand = (ps.empty() ? "" : ps[0].getValue());
get(ps, getName() + "/9ComputeCommand");
std::string computeCommand = (ps.empty() ? "" : ps[0].getValue());
if(action == "check")
command += " " + modelName + " " + checkCommand;
else if(action == "compute")
command += " " + modelName + " " + computeCommand;
}
// append "-onelab" command
command += " " + _socketSwitch + " "; command += " " + _socketSwitch + " ";
} }
else{ else{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment