diff --git a/source/RobotAPI/libraries/armem/server/ltm/CoreSegment.cpp b/source/RobotAPI/libraries/armem/server/ltm/CoreSegment.cpp index 6ec04595cea542cd62d6245712e25f8adc5b0a1b..5d63c3339e0bb2f8abb02ddf2c98be2ad6145afb 100644 --- a/source/RobotAPI/libraries/armem/server/ltm/CoreSegment.cpp +++ b/source/RobotAPI/libraries/armem/server/ltm/CoreSegment.cpp @@ -84,7 +84,7 @@ namespace armarx::armem::server::ltm e.id() = id().getCoreSegmentID().cleanID(); - ARMARX_INFO << VAROUT(id()); + //ARMARX_INFO << VAROUT(id()); auto& conv = processors->defaultTypeConverter; if (fileExists(DiskMemoryItemMixin::TYPE_FILENAME + conv.suffix)) diff --git a/source/RobotAPI/libraries/armem/server/ltm/Entity.cpp b/source/RobotAPI/libraries/armem/server/ltm/Entity.cpp index ac9433dfb78be5a973925feb9c917a67699f1d7e..f666a25e326625a930c863c58e8e260e086ce87e 100644 --- a/source/RobotAPI/libraries/armem/server/ltm/Entity.cpp +++ b/source/RobotAPI/libraries/armem/server/ltm/Entity.cpp @@ -53,15 +53,6 @@ namespace armarx::armem::server::ltm } - // check if this is already a microsec folder (legacy export support) - //if (std::stol(secName) > 1647524607 ) // the time in us the new export was implemented - //{ - // EntitySnapshot c(memoryParentPath, id().withTimestamp(timeFromStringMicroSeconds(secName)), processors, currentMode, currentExport); - // func(c); - // continue; - //} - - for (const auto& s : util::fs::getAllDirectories(d)) // seconds { if (!util::fs::detail::isNumberString(s.filename())) diff --git a/source/RobotAPI/libraries/armem/server/ltm/EntityInstance.cpp b/source/RobotAPI/libraries/armem/server/ltm/EntityInstance.cpp index 0be6975beb6785dbb2426b74c0d70000edf0ce27..b0302a5cef0178acec1b539500bb591c9eb684f2 100644 --- a/source/RobotAPI/libraries/armem/server/ltm/EntityInstance.cpp +++ b/source/RobotAPI/libraries/armem/server/ltm/EntityInstance.cpp @@ -54,51 +54,6 @@ namespace armarx::armem::server::ltm aron::data::DictPtr datadict = nullptr; aron::data::DictPtr metadatadict = nullptr; - /*if (connected() && collectionExists()) - { - if (auto d = documentExists(); d) - { - nlohmann::json doc = *d; - - if (doc.contains(DATA)) - { - std::vector<nlohmann::json> instances = doc[DATA]; - if (instances.size() > (size_t)id().instanceIndex) - { - nlohmann::json data = instances[id().instanceIndex]; - std::string dataStr = data.dump(); - - std::vector<unsigned char> dataVec{dataStr.begin(), dataStr.end()}; - auto dataaron = dictConverter.convert({dataVec, ""}, {}); - datadict = aron::data::Dict::DynamicCastAndCheck(dataaron); - } - else - { - ARMARX_ERROR << "Could not find the instance key. Continuing without data."; - } - } - else - { - ARMARX_ERROR << "Could not find the data key. Continuing without data."; - } - - if (doc.contains(METADATA)) - { - nlohmann::json metadata = doc[METADATA]; - std::string metadataStr = metadata.dump(); - std::vector<unsigned char> metadataVec{metadataStr.begin(), metadataStr.end()}; - auto metadataaron = dictConverter.convert({metadataVec, ""}, {}); - metadatadict = aron::data::Dict::DynamicCastAndCheck(metadataaron); - } - else - { - ARMARX_ERROR << "Could not find the metadata key. Continuing without metadata."; - } - } - } else */ - - //ARMARX_INFO << VAROUT(getFullPath()); - if (fullPathExists()) { diff --git a/source/RobotAPI/libraries/armem/server/ltm/ProviderSegment.cpp b/source/RobotAPI/libraries/armem/server/ltm/ProviderSegment.cpp index 983dfb8943d5d541bbb62973165b78bb1a3160f1..0f6f4d7279474d8653072660aede5239caf93194 100644 --- a/source/RobotAPI/libraries/armem/server/ltm/ProviderSegment.cpp +++ b/source/RobotAPI/libraries/armem/server/ltm/ProviderSegment.cpp @@ -26,18 +26,6 @@ namespace armarx::armem::server::ltm { std::lock_guard l(ltm_mutex); - /*if (connected() && collectionExists()) - { - for (const auto& doc : getAllDocuments()) - { - std::string id_str = doc[FOREIGN_KEY]; - armem::MemoryID segment_id(id_str); - Entity c( - getMemoryBasePath(), getSettings(), getExportName(), segment_id, processors); - func(c); - } - } else */ - if (fullPathExists()) { @@ -61,16 +49,6 @@ namespace armarx::armem::server::ltm { std::lock_guard l(ltm_mutex); - /*if (connected() && collectionExists()) - { - auto c = Entity(getMemoryBasePath(), - getSettings(), - getExportName(), - id().withEntityName(name), - processors); - return (bool)c.collectionExists(); - }*/ - if (fullPathExists()) { ARMARX_INFO << VAROUT(id().getEntityID()); @@ -119,7 +97,7 @@ namespace armarx::armem::server::ltm e.aronType() = aron; } - ARMARX_INFO << VAROUT(id()); + //ARMARX_INFO << VAROUT(id()); /*