From 804816f0145e71353b462ca18f991aaaacd22c1c Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Thu, 25 Feb 2016 00:35:47 +0100 Subject: [PATCH] Fix table parameter parsing --- include/server/api/table_parameter_grammar.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/server/api/table_parameter_grammar.hpp b/include/server/api/table_parameter_grammar.hpp index 24424b2b8..a585f5abe 100644 --- a/include/server/api/table_parameter_grammar.hpp +++ b/include/server/api/table_parameter_grammar.hpp @@ -36,9 +36,9 @@ struct TableParametersGrammar final : public BaseParametersGrammar { parameters.sources = std::move(sources); }; - destinations_rule = qi::lit("destinations=") >> -qi::uint_ % ";"; - sources_rule = qi::lit("sources=") >> -qi::uint_ % ";"; - table_rule = destinations_rule[set_destiantions] | sources_rule[set_sources]; + destinations_rule = (qi::lit("destinations=") >> (qi::ulong_ % ";")[set_destiantions]) | qi::lit("destinations=all"); + sources_rule = (qi::lit("sources=") >> (qi::ulong_ % ";")[set_sources]) | qi::lit("sources=all"); + table_rule = destinations_rule | sources_rule; root_rule = -((base_rule | table_rule) % '&'); } @@ -46,8 +46,8 @@ struct TableParametersGrammar final : public BaseParametersGrammar private: qi::rule root_rule, table_rule; - qi::rule sources_rule; - qi::rule destinations_rule; + qi::rule sources_rule; + qi::rule destinations_rule; }; } }