Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rdio-scanner: Fix systemID to match the datatype used in rdio-scanner #860

Merged
merged 1 commit into from
Nov 12, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions plugins/rdioscanner_uploader/rdioscanner_uploader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
struct Rdio_Scanner_System {
std::string api_key;
std::string short_name;
std::string system_id;
uint32_t system_id;
std::string talkgroupsFile;
Talkgroups *talkgroups;
bool compress_wav;
Expand Down Expand Up @@ -45,7 +45,7 @@ class Rdio_Scanner_Uploader : public Plugin_Api {

int upload(Call_Data_t call_info) {
std::string api_key;
std::string system_id;
uint32_t system_id;
std::string talkgroup_group = call_info.talkgroup_group;
std::string talkgroup_tag = call_info.talkgroup_tag;
std::string talkgroup_alpha_tag = call_info.talkgroup_alpha_tag;
Expand Down Expand Up @@ -246,7 +246,7 @@ class Rdio_Scanner_Uploader : public Plugin_Api {
curl_formadd(&formpost,
&lastptr,
CURLFORM_COPYNAME, "system",
CURLFORM_COPYCONTENTS, system_id.c_str(),
CURLFORM_COPYCONTENTS, std::to_string(system_id).c_str(),
CURLFORM_END);

curl_formadd(&formpost,
Expand Down Expand Up @@ -408,7 +408,7 @@ class Rdio_Scanner_Uploader : public Plugin_Api {
Rdio_Scanner_System sys;

sys.api_key = element.value("apiKey", "");
sys.system_id = element.value("systemId", "");
sys.system_id = element.value("systemId", 0);
sys.short_name = element.value("shortName", "");
BOOST_LOG_TRIVIAL(info) << "Uploading calls for: " << sys.short_name;
this->data.systems.push_back(sys);
Expand Down