Module: sems Branch: master Commit: 1e2bbfd3e9203b828a9a1178d28c0e657bba0755 URL: https://github.com/sems-server/sems/commit/1e2bbfd3e9203b828a9a1178d28c0e657bba0755
Author: Juha Heinanen <j...@tutpro.com> Committer: Juha Heinanen <j...@tutpro.com> Date: 2016-03-18T08:19:09+02:00 dsm/mods/mod_utils: in decodeJson removed extra single quotes from around string json values --- Modified: apps/dsm/mods/mod_utils/ModUtils.cpp --- Diff: https://github.com/sems-server/sems/commit/1e2bbfd3e9203b828a9a1178d28c0e657bba0755.diff Patch: https://github.com/sems-server/sems/commit/1e2bbfd3e9203b828a9a1178d28c0e657bba0755.patch --- diff --git a/apps/dsm/mods/mod_utils/ModUtils.cpp b/apps/dsm/mods/mod_utils/ModUtils.cpp index 76e247f..795533b 100644 --- a/apps/dsm/mods/mod_utils/ModUtils.cpp +++ b/apps/dsm/mods/mod_utils/ModUtils.cpp @@ -157,23 +157,24 @@ bool utils_play_count(DSMSession* sc_sess, unsigned int cnt, } void utils_set_session_vars(DSMSession* sc_sess, string prefix, AmArg json) { - INFO("go through struct"); if (json.getType() == AmArg::Struct) { for (AmArg::ValueStruct::const_iterator it1 = json.begin(); it1 != json.end(); it1++) { - INFO("key %s\n", (it1->first).c_str()); utils_set_session_vars(sc_sess, prefix + "." + it1->first, it1->second); } } else if (json.getType() == AmArg::Array) { - INFO("go through array"); for (std::vector<AmArg>::size_type i = 0; i != json.size(); i++) { - INFO("index %d\n", (int)i); utils_set_session_vars(sc_sess, prefix + "[" + int2str((int)i) + "]", json[i]); } } else { - INFO("setting %s = %s\n", prefix.c_str(), AmArg::print(json).c_str()); - sc_sess->var[prefix] = AmArg::print(json).c_str(); + string json_string = AmArg::print(json); + DBG("setting %s = %s\n", prefix.c_str(), json_string.c_str()); + if (isArgCStr(json) && (json_string.size() > 1)) { + json_string.erase(json_string.end() - 1); + json_string.erase(json_string.begin()); + } + sc_sess->var[prefix] = json_string.c_str(); } } _______________________________________________ Semsdev mailing list Semsdev@lists.iptel.org http://lists.iptel.org/mailman/listinfo/semsdev
