From 8636800feeae8398116163988b19d45c2c0b01c1 Mon Sep 17 00:00:00 2001 From: Ren RenJuan Date: Thu, 16 Jan 2014 05:39:38 +0000 Subject: [PATCH] * --- ACTK1_0/common/init.cpp | 4 ++-- ACTK1_0/common/init.hpp | 2 +- AusRegCliever/server/mdAusReg.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ACTK1_0/common/init.cpp b/ACTK1_0/common/init.cpp index 81a40ee..503cea9 100644 --- a/ACTK1_0/common/init.cpp +++ b/ACTK1_0/common/init.cpp @@ -88,10 +88,10 @@ void init(const std::string& 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; static const Init doInit(stdPropsPath); diff --git a/ACTK1_0/common/init.hpp b/ACTK1_0/common/init.hpp index 40df735..53fc711 100644 --- a/ACTK1_0/common/init.hpp +++ b/ACTK1_0/common/init.hpp @@ -4,6 +4,6 @@ #include void init(const std::string &system_props_file); -void scenario(int which); +void scenario(int which,char *cfgPath); #endif diff --git a/AusRegCliever/server/mdAusReg.cpp b/AusRegCliever/server/mdAusReg.cpp index 8acbc1a..008e616 100644 --- a/AusRegCliever/server/mdAusReg.cpp +++ b/AusRegCliever/server/mdAusReg.cpp @@ -35,7 +35,7 @@ void ausRegEPPTK::doOTEA() string op("newInstance"); if (!daysRunning) - scenario(tkScenario); + scenario(tkScenario,thisConfig->cfg_path); try { Timer::setTime("20070101.010101"); @@ -81,7 +81,7 @@ void ausRegEPPTK::doOTEB() string op("newInstance"); if (!daysRunning) - scenario(tkScenario); + scenario(tkScenario,thisConfig->cfg_path); try { Timer::setTime("20070101.010101");