Commit ea0bfc5b authored by aivan_2008's avatar aivan_2008
Browse files

Append storage mount point to UApplication

--HG--
branch : VAsettings
parent 87947f779faf
......@@ -152,6 +152,7 @@ int UAppCore<ApplicationT, EngineControlT, ProjectT, ServerControlT, TestManager
databaseMainPath=projectIniFile("General","DatabaseMainPath","");
remoteFtpDatabasePath=projectIniFile("General","RemoteFtpDatabasePath","");
if(startupDelay>0)
{
RDK::Sleep(startupDelay);
......@@ -171,6 +172,7 @@ int UAppCore<ApplicationT, EngineControlT, ProjectT, ServerControlT, TestManager
std::string database_login = projectIniFile("PostgreSQL","DatabaseLogin","");
std::string database_password = projectIniFile("PostgreSQL","DatabasePassword","");
std::string storageMountPoint = projectIniFile("Storage","StorageMountPoint","");
application.SetApplicationFileName(application_file_name);
application.SetLogCreationMode(logCreationMode);
......@@ -214,6 +216,9 @@ int UAppCore<ApplicationT, EngineControlT, ProjectT, ServerControlT, TestManager
return returnCode;
}
if(storageMountPoint!="")
application.SetStorageMountPoint(storageMountPoint);
if(databaseMainPath!="")
{
application.SetDatabaseMainPath(databaseMainPath);
......
......@@ -135,6 +135,21 @@ bool UApplication::SetDatabaseMainPath(const std::string &value)
return true;
}
/// ( /Bin/Configs)
const std::string& UApplication::GetStorageMountPoint(void) const
{
return StorageMountPoint;
}
bool UApplication::SetStorageMountPoint(const std::string &value)
{
if(StorageMountPoint == value)
return true;
StorageMountPoint=value;
return true;
}
/// ( /Bin/Models)
const std::string& UApplication::GetModelsMainPath(void) const
{
......@@ -1350,7 +1365,7 @@ bool UApplication::OpenProject(const std::string &filename)
bool is_loaded(false);
if(!ProjectXml.LoadFromFile(filename,""))
{
MLog_LogMessage(RDK_SYS_MESSAGE,RDK_EX_ERROR, (std::string("Can't read project file ")+filename).c_str());
MLog_LogMessage(RDK_SYS_MESSAGE,RDK_EX_WARNING, (std::string("Can't read project file ")+filename).c_str());
return false;
}
......
......@@ -56,6 +56,9 @@ std::string LibrariesPath;
/// ( /Database)
std::string DatabaseMainPath;
///
std::string StorageMountPoint;
/// ( /Bin/Models)
std::string ModelsMainPath;
......@@ -173,6 +176,9 @@ bool SetConfigsMainPath(const std::string &value);
const std::string& GetDatabaseMainPath(void) const;
bool SetDatabaseMainPath(const std::string &value);
const std::string& GetStorageMountPoint(void) const;
bool SetStorageMountPoint(const std::string &value);
/// ( - MockLibs, RTLibs)
const std::string& GetLibrariesPath(void) const;
bool SetLibrariesPath(const std::string &value);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment