Skip to content

Commit ef1b0fc

Browse files
only 'default' accepted, value does not matter
1 parent c799dc2 commit ef1b0fc

2 files changed

Lines changed: 3 additions & 18 deletions

File tree

Common/Utils/include/CommonUtils/NameConf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ class NameConf : public o2::conf::ConfigurableParamHelper<NameConf>
6767
static constexpr std::string_view CCDBMETA = "ccdb_meta"; // hardcoded
6868
static constexpr std::string_view CCDBQUERY = "ccdb_query"; // hardcoded
6969
static constexpr std::string_view CCDBRunTag = "runNumber";
70+
static constexpr std::string_view CCDBDefaultEntry = "default";
7071

7172
// Filename to store geometry file
7273
static std::string getGeomFileName(const std::string_view prefix = "");

Framework/Core/src/CCDBHelpers.cxx

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <TError.h>
2424
#include <TMemFile.h>
2525
#include <functional>
26-
#include <boost/algorithm/string/predicate.hpp>
2726

2827
namespace o2::framework
2928
{
@@ -213,23 +212,8 @@ auto populateCacheWith(std::shared_ptr<CCDBFetcherHelper> const& helper,
213212
continue;
214213
}
215214
// printing in case we find a default entry
216-
// we allow "default", "Default", "DEFAULT",
217-
// and they can be equal to a case-insensitive "true" or "1"
218-
auto defMetaData = headers.find("default");
219-
auto defMetaDataInCap = headers.find("Default");
220-
auto defMetaDataCap = headers.find("DEFAULT");
221-
if (defMetaData != headers.end()) {
222-
if (boost::iequals((*defMetaData).second, "true") || (*defMetaData).second == "1") {
223-
LOGP(info, "******** Default entry used for {} ********", path);
224-
}
225-
} else if (defMetaDataInCap != headers.end()) {
226-
if (boost::iequals((*defMetaDataInCap).second, "true") || (*defMetaDataInCap).second == "1") {
227-
LOGP(info, "******** Default entry used for {} ********", path);
228-
}
229-
} else if (defMetaDataCap != headers.end()) {
230-
if (boost::iequals((*defMetaDataCap).second, "true") || (*defMetaDataCap).second == "1") {
231-
LOGP(info, "******** Default entry used for {} ********", path);
232-
}
215+
if (headers.find("default") != headers.end()) {
216+
LOGP(detail, "******** Default entry used for {} ********", path);
233217
}
234218
if (etag.empty()) {
235219
helper->mapURL2UUID[path] = headers["ETag"]; // update uuid

0 commit comments

Comments
 (0)