niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow empty prefix list to get all params; check depth correctly. (#230)

Browse source 
* Allow empty prefix list to get all params; check depth correctly.

* use enum instead of constant
This commit is contained in:
gerkey 2016-06-20 17:55:57 -07:00 • committed by GitHub
parent 759b063db5
commit 3553107823
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rclcpp/src/rclcpp/node.cpp
View file

@ -19,6 +19,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "rcl_interfaces/srv/list_parameters.hpp"
#include "rclcpp/node.hpp" #include "rclcpp/node.hpp"
using rclcpp::node::Node; using rclcpp::node::Node;
@ -271,17 +272,21 @@ Node::list_parameters(
// TODO(esteve): define parameter separator, use "." for now // TODO(esteve): define parameter separator, use "." for now
for (auto & kv : parameters_) { for (auto & kv : parameters_) {
if (std::any_of(prefixes.cbegin(), prefixes.cend(), [&kv, &depth](const std::string & prefix) { if (((prefixes.size() == 0) &&
((depth == rcl_interfaces::srv::ListParameters::Request::DEPTH_RECURSIVE) ||
(static_cast<uint64_t>(std::count(kv.first.begin(), kv.first.end(), '.')) < depth))) ||
(std::any_of(prefixes.cbegin(), prefixes.cend(), [&kv, &depth](const std::string & prefix) {
if (kv.first == prefix) { if (kv.first == prefix) {
return true; return true;
} else if (kv.first.find(prefix + ".") == 0) { } else if (kv.first.find(prefix + ".") == 0) {
size_t length = prefix.length(); size_t length = prefix.length();
std::string substr = kv.first.substr(length); std::string substr = kv.first.substr(length);
// Cast as unsigned integer to avoid warning // Cast as unsigned integer to avoid warning
return static_cast<uint64_t>(std::count(substr.begin(), substr.end(), '.')) < depth; return (depth == rcl_interfaces::srv::ListParameters::Request::DEPTH_RECURSIVE) ||
(static_cast<uint64_t>(std::count(substr.begin(), substr.end(), '.')) < depth);
} }
return false; return false;
})) })))
{ {
result.names.push_back(kv.first); result.names.push_back(kv.first);
size_t last_separator = kv.first.find_last_of('.'); size_t last_separator = kv.first.find_last_of('.');