From 7841f67ebe08678b78de15ae98988d0d8d9de94b Mon Sep 17 00:00:00 2001 From: jacobkeeler Date: Tue, 10 Sep 2019 16:21:15 -0400 Subject: Fix reading of Consumer Friendly Messages in PROPRIETARY mode --- .../policy_regular/src/sql_pt_representation.cc | 29 ++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/components/policy/policy_regular/src/sql_pt_representation.cc b/src/components/policy/policy_regular/src/sql_pt_representation.cc index 60a4ef6021..eca9b60c72 100644 --- a/src/components/policy/policy_regular/src/sql_pt_representation.cc +++ b/src/components/policy/policy_regular/src/sql_pt_representation.cc @@ -680,10 +680,35 @@ bool SQLPTRepresentation::GatherConsumerFriendlyMessages( if (query.Prepare(sql_pt::kCollectFriendlyMsg)) { while (query.Next()) { UserFriendlyMessage msg; + + msg.tts = query.GetString(1); + msg.label = query.GetString(2); + msg.line1 = query.GetString(3); + msg.line2 = query.GetString(4); + msg.text_body = query.GetString(5); msg.message_code = query.GetString(7); - std::string language = query.GetString(6); - (*messages->messages)[msg.message_code].languages[language]; + std::string language = query.GetString(6); + if (!msg.tts.empty()) { + *(*messages->messages)[msg.message_code].languages[language].tts = + msg.tts; + } + if (!msg.label.empty()) { + *(*messages->messages)[msg.message_code].languages[language].label = + msg.label; + } + if (!msg.line1.empty()) { + *(*messages->messages)[msg.message_code].languages[language].line1 = + msg.line1; + } + if (!msg.line2.empty()) { + *(*messages->messages)[msg.message_code].languages[language].line2 = + msg.line2; + } + if (!msg.text_body.empty()) { + *(*messages->messages)[msg.message_code].languages[language].textBody = + msg.text_body; + } } } else { LOG4CXX_WARN(logger_, "Incorrect statement for select friendly messages."); -- cgit v1.2.1