This commit is contained in:
parent
a31c00607f
commit
8636800fee
|
@ -88,10 +88,10 @@ void init(const std::string& system_props_file)
|
||||||
static const Init doInit(system_props_file);
|
static const Init doInit(system_props_file);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string stdPropsPath("/home/drde/etc/toolkit2.conf");
|
|
||||||
|
|
||||||
void scenario(int scenario)
|
void scenario(int scenario,char *cgfPath)
|
||||||
{
|
{
|
||||||
|
std::string stdPropsPath(cfgPath);
|
||||||
|
|
||||||
tkScenario = scenario;
|
tkScenario = scenario;
|
||||||
static const Init doInit(stdPropsPath);
|
static const Init doInit(stdPropsPath);
|
||||||
|
|
|
@ -4,6 +4,6 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
void init(const std::string &system_props_file);
|
void init(const std::string &system_props_file);
|
||||||
void scenario(int which);
|
void scenario(int which,char *cfgPath);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -35,7 +35,7 @@ void ausRegEPPTK::doOTEA()
|
||||||
string op("newInstance");
|
string op("newInstance");
|
||||||
|
|
||||||
if (!daysRunning)
|
if (!daysRunning)
|
||||||
scenario(tkScenario);
|
scenario(tkScenario,thisConfig->cfg_path);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Timer::setTime("20070101.010101");
|
Timer::setTime("20070101.010101");
|
||||||
|
@ -81,7 +81,7 @@ void ausRegEPPTK::doOTEB()
|
||||||
string op("newInstance");
|
string op("newInstance");
|
||||||
|
|
||||||
if (!daysRunning)
|
if (!daysRunning)
|
||||||
scenario(tkScenario);
|
scenario(tkScenario,thisConfig->cfg_path);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Timer::setTime("20070101.010101");
|
Timer::setTime("20070101.010101");
|
||||||
|
|
Loading…
Reference in New Issue