Add doubleFromJson

diff --git a/pdns/json.cc b/pdns/json.cc
index c0fda4e7ae0249ded244d0111f052f06326d295b..29e24f2caff77eeca45844cafbfadf26af8bf77c 100644 (file)
--- a/pdns/json.cc
+++ b/pdns/json.cc
@@ -53,6 +53,31 @@ int intFromJson(const Json container, const std::string& key, const int default_
   }
 }
 
+double doubleFromJson(const Json container, const std::string& key)
+{
+  auto val = container[key];
+  if (val.is_number()) {
+    return val.number_value();
+  } else if (val.is_string()) {
+    return std::stod(val.string_value());
+  } else {
+    throw JsonException("Key '" + string(key) + "' not an Integer or not present");
+  }
+}
+
+double doubleFromJson(const Json container, const std::string& key, const double default_value)
+{
+  auto val = container[key];
+  if (val.is_number()) {
+    return val.number_value();
+  } else if (val.is_string()) {
+    return std::stod(val.string_value());
+  } else {
+    // TODO: check if value really isn't present
+    return default_value;
+  }
+}
+
 string stringFromJson(const Json container, const std::string &key)
 {
   const Json val = container[key];

diff --git a/pdns/json.hh b/pdns/json.hh
index ad214c5d611254d912a82e651f3fac5536570f56..9d08f27b08a85672535a5a928653f9f47845341f 100644 (file)
--- a/pdns/json.hh
+++ b/pdns/json.hh
@@ -27,6 +27,8 @@
 
 int intFromJson(const json11::Json container, const std::string& key);
 int intFromJson(const json11::Json container, const std::string& key, const int default_value);
+double doubleFromJson(const json11::Json container, const std::string& key);
+double doubleFromJson(const json11::Json container, const std::string& key, const double default_value);
 std::string stringFromJson(const json11::Json container, const std::string &key);
 bool boolFromJson(const json11::Json container, const std::string& key);
 bool boolFromJson(const json11::Json container, const std::string& key, const bool default_value);