From f0cb642d94feedc2b65f992e666122a36a71af26 Mon Sep 17 00:00:00 2001 From: Roker Date: Thu, 16 Aug 2018 16:24:05 +0200 Subject: [PATCH] what to do when PacakgeVersion is read from a JSON file: --- server/server_version.cc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/server/server_version.cc b/server/server_version.cc index 424d5a3..f6b3574 100644 --- a/server/server_version.cc +++ b/server/server_version.cc @@ -3,8 +3,12 @@ #include #include #include "pep-utils.hh" +#include "pep-utils-json.hh" #include // for PEP_VERSION and get_engine_version() #include +#include "json_spirit/json_spirit_reader.h" + +namespace js = json_spirit; namespace { @@ -84,11 +88,19 @@ ServerVersion::ServerVersion(unsigned maj, unsigned min, unsigned p) { if (!PackageVersion) try{ - const std::string pkg_version_from_file = + const std::string file_content = boost::algorithm::trim_copy( pEp::utility::slurp("PackageVersion") ); - PackageVersion = strdup(pkg_version_from_file.c_str()); + +/* to parse JSON: + js::Value v; + js::read_or_throw(file_content, v); + const js::Object obj = v.get_obj(); + PackageVersion = pEp::utility::from_json_object(obj, "package_version"); +*/ + + PackageVersion = strdup(file_content.c_str()); this->package_version = PackageVersion; } catch(std::runtime_error&)