From 7379c0531734ff1f432a52cc4209c91ccad4c999 Mon Sep 17 00:00:00 2001 From: Mikhail Mineev <Mikhail.Mineev@cern.ch> Date: Fri, 20 Sep 2024 13:55:09 +0200 Subject: [PATCH] method CrestFsClient::storeData corrected --- CrestApi/CrestApiFs.h | 2 +- src/CrestApiFs.cxx | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/CrestApi/CrestApiFs.h b/CrestApi/CrestApiFs.h index 743465c..754ac8e 100644 --- a/CrestApi/CrestApiFs.h +++ b/CrestApi/CrestApiFs.h @@ -493,7 +493,7 @@ namespace Crest * @param endTime - end time, if endtime = 0, the server does not use this parameter in the internal check. */ void storePayloadDump(const std::string &tag, - uint64_t since, + long_t since, const std::string &js, const std::string &payloadFormat, const std::string &objectType, diff --git a/src/CrestApiFs.cxx b/src/CrestApiFs.cxx index 593cac6..a1adcf6 100644 --- a/src/CrestApiFs.cxx +++ b/src/CrestApiFs.cxx @@ -685,20 +685,15 @@ namespace Crest nlohmann::json js_data = storeSetJson.to_json(); - nlohmann::json res; - auto it = js_data.find("resources"); - if (it != js_data.end()) - { - res = js_data["resources"]; - } + std::vector<StoreDto> res = storeSetJson.resources; try { for (auto &kvp : res) { - std::string payload = kvp.value("data", ""); - int since = kvp.value("since", 0); - std::string streamer = kvp.value("streamerInfo", ""); + std::string payload = kvp.data; + long_t since = kvp.since; + std::string streamer = kvp.getStreamerInfo().dump(); // Register everything on the file system. storePayloadDump(tag, since, payload, payloadFormat, objectType, compressionType, version, streamer); @@ -735,7 +730,7 @@ namespace Crest } void CrestFsClient::storePayloadDump(const std::string &tag, - uint64_t since, + long_t since, const std::string &js, const std::string &payloadFormat, const std::string &objectType, -- GitLab