-// Copyright (C) 2009-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2009-2012 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
std::string::size_type p2 = _job_file.find_last_of(".");
_job_file_name_complete = _job_file.substr(p1+1);
_job_file_name = _job_file.substr(p1+1,p2-p1-1);
-
- if (_job_file != "")
- add_in_file(_job_file);
}
std::string
Launcher::Job::setEnvFile(const std::string & env_file)
{
_env_file = env_file;
- if (_env_file != "")
- add_in_file(_env_file);
}
std::string
std::size_t pos = edt_value.find(":");
if (edt_value != "") {
+ if (pos == edt_value.npos) {
+ throw LauncherException("[Launcher::Job::checkMaximumDuration] Error on definition: " + edt_value);
+ }
std::string begin_edt_value = edt_value.substr(0, pos);
std::string mid_edt_value = edt_value.substr(pos, 1);
std::string end_edt_value = edt_value.substr(pos + 1, edt_value.npos);
_result_directory = getenv("HOME");
// _in_files
- for(std::list<std::string>::iterator it = _in_files.begin(); it != _in_files.end(); it++)
+ std::list<std::string> in_files(_in_files);
+ in_files.push_back(_job_file);
+ if (_env_file != "")
+ in_files.push_back(_env_file);
+ for(std::list<std::string>::iterator it = in_files.begin(); it != in_files.end(); it++)
{
std::string file = *it;
if (file.substr(0, 1) == std::string("/"))
local_file = file;
else
+#ifndef WIN32
local_file = _local_directory + "/" + file;
+#else
+ local_file = file;
+#endif
- // remote file -> get only file name from _in_files
+ // remote file -> get only file name from in_files
size_t found = file.find_last_of("/");
std::string remote_file = _work_directory + "/" + file.substr(found+1);