X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5014a9d76df7cbe75b175d635908049ccd702c81..ebd170a764ab9660adee464588cda1801c7986b4:/projects/stargazer/plugins/configuration/sgconfig/parser_services.cpp
diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_services.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_services.cpp
index 0c1e1476..2ccddd38 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_services.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_services.cpp
@@ -47,14 +47,14 @@ void GET_SERVICES::CreateAnswer()
}*/
m_answer = "";
- SERVICE_CONF conf;
+ ServiceConf conf;
int h = m_services.OpenSearch();
while (m_services.SearchNext(h, &conf) == 0)
{
m_answer += "";
+ "\" cost=\"" + std::to_string(conf.cost) +
+ "\" payDay=\"" + std::to_string(conf.payDay) + "\"/>";
}
m_services.CloseSearch(h);
m_answer += "";
@@ -80,14 +80,14 @@ void GET_SERVICE::CreateAnswer()
return;
}*/
- SERVICE_CONF conf;
+ ServiceConf conf;
if (!m_services.Find(m_name, &conf))
m_answer = "";
else
m_answer += "<" + m_tag + " name=\"" + conf.name +
"\" comment=\"" + Encode12str(conf.comment) +
- "\" cost=\"" + x2str(conf.cost) +
- "\" payDay=\"" + x2str(conf.payDay) + "\"/>";
+ "\" cost=\"" + std::to_string(conf.cost) +
+ "\" payDay=\"" + std::to_string(conf.payDay) + "\"/>";
}
int ADD_SERVICE::Start(void *, const char * el, const char ** attr)
@@ -102,11 +102,11 @@ int ADD_SERVICE::Start(void *, const char * el, const char ** attr)
void ADD_SERVICE::CreateAnswer()
{
- SERVICE_CONF conf(m_name);
+ ServiceConf conf(m_name);
if (m_services.Add(conf, &m_currAdmin) == 0)
m_answer = "<" + m_tag + " result=\"Ok\"/>";
else
- m_answer = "<" + m_tag + " result=\"Error. " + m_services.GetStrError() + "\"/>";
+ m_answer = "<" + m_tag + " result=\"" + m_services.GetStrError() + "\"/>";
}
int DEL_SERVICE::Start(void *, const char * el, const char ** attr)
@@ -124,7 +124,7 @@ void DEL_SERVICE::CreateAnswer()
if (m_services.Del(m_name, &m_currAdmin) == 0)
m_answer = "<" + m_tag + " result=\"Ok\"/>";
else
- m_answer = "<" + m_tag + " result=\"Error. " + m_services.GetStrError() + "\"/>";
+ m_answer = "<" + m_tag + " result=\"" + m_services.GetStrError() + "\"/>";
}
int CHG_SERVICE::Start(void *, const char * el, const char ** attr)
@@ -178,25 +178,25 @@ int CHG_SERVICE::Start(void *, const char * el, const char ** attr)
void CHG_SERVICE::CreateAnswer()
{
- if (m_service.name.empty())
+ if (!m_service.name)
{
m_answer = "<" + m_tag + " result=\"Empty service name.\"/>";
return;
}
- if (!m_services.Exists(m_service.name.const_data()))
+ if (!m_services.Exists(m_service.name.value()))
{
- m_answer = "<" + m_tag + " result = \"Service '" + m_service.name.const_data() + "' does not exist.\"/>";
+ m_answer = "<" + m_tag + " result = \"Service '" + m_service.name.value() + "' does not exist.\"/>";
return;
}
- SERVICE_CONF orig;
- m_services.Find(m_service.name.const_data(), &orig);
+ ServiceConf orig;
+ m_services.Find(m_service.name.value(), &orig);
- SERVICE_CONF_RES conf(orig);
- conf.Splice(m_service);
+ ServiceConfOpt conf(orig);
+ conf.splice(m_service);
- if (m_services.Change(conf.GetData(), &m_currAdmin) != 0)
+ if (m_services.Change(conf.get({}), &m_currAdmin) != 0)
m_answer = "<" + m_tag + " result = \"" + m_services.GetStrError() + "\"/>";
else
m_answer = "<" + m_tag + " result = \"Ok\"/>";