From 2ec8c8f687286b9934502527dd3236393b098367 Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Thu, 24 Mar 2022 21:11:22 -0700 Subject: [PATCH] Framework fix for negative JSON fields. --- src/framework/MicroService.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/framework/MicroService.h b/src/framework/MicroService.h index 058139a..7b0d7eb 100644 --- a/src/framework/MicroService.h +++ b/src/framework/MicroService.h @@ -324,19 +324,19 @@ namespace OpenWifi::RESTAPI_utils { S = Obj->get(Field).toString(); } - inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, double & V) { + inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, double & Value) { if(Obj->has(Field) && !Obj->isNull(Field)) - V = Obj->get(Field).extract(); + Value = Obj->get(Field).extract(); } - inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, float & V) { + inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, float & Value) { if(Obj->has(Field) && !Obj->isNull(Field)) - V = Obj->get(Field).extract(); + Value = (float) Obj->get(Field).extract(); } - inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, bool &V) { + inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, bool &Value) { if(Obj->has(Field) && !Obj->isNull(Field)) - V = (Obj->get(Field).toString() == "true"); + Value = (Obj->get(Field).toString() == "true"); } inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, int16_t &Value) { @@ -385,22 +385,22 @@ namespace OpenWifi::RESTAPI_utils { } } - inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Types::StringVec &V) { + inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Types::StringVec &Value) { if(Obj->isArray(Field) && !Obj->isNull(Field)) { - V.clear(); + Value.clear(); Poco::JSON::Array::Ptr A = Obj->getArray(Field); for(const auto &i:*A) { - V.push_back(i.toString()); + Value.push_back(i.toString()); } } } - inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Types::TagList &V) { + inline void field_from_json(const Poco::JSON::Object::Ptr &Obj, const char *Field, Types::TagList &Value) { if(Obj->isArray(Field) && !Obj->isNull(Field)) { - V.clear(); + Value.clear(); Poco::JSON::Array::Ptr A = Obj->getArray(Field); for(const auto &i:*A) { - V.push_back(i); + Value.push_back(i); } } }