From 8d78c38ae2d506a49961ae8d6131fbf835d76d17 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Wed, 11 Aug 2021 11:58:48 +0200
Subject: [PATCH] Fix property names
---
.../RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp | 2 +-
source/RobotAPI/libraries/armem/core/wm/visitor/Visitor.cpp | 1 +
source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp b/source/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp
index ab4cb5d13..68c000619 100644
--- a/source/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp
+++ b/source/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp
@@ -78,7 +78,7 @@ namespace armarx::armem::ltm
void Memory::defineProperties(armarx::PropertyDefinitionsPtr defs, const std::string& prefix)
{
- defs->optional(dbsettings.host, prefix + ".ltm.10_host");
+ defs->optional(dbsettings.host, prefix + "ltm.10_host");
defs->optional(dbsettings.port, prefix + "ltm.11_port");
defs->optional(dbsettings.user, prefix + "ltm.20_user");
defs->optional(dbsettings.password, prefix + "ltm.21_password");
diff --git a/source/RobotAPI/libraries/armem/core/wm/visitor/Visitor.cpp b/source/RobotAPI/libraries/armem/core/wm/visitor/Visitor.cpp
index 1140bc11b..9448f55f8 100644
--- a/source/RobotAPI/libraries/armem/core/wm/visitor/Visitor.cpp
+++ b/source/RobotAPI/libraries/armem/core/wm/visitor/Visitor.cpp
@@ -3,6 +3,7 @@
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
#include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
+#include <RobotAPI/libraries/armem/server/wm/memory_definitions.h>
#include <RobotAPI/libraries/armem/core/error.h>
diff --git a/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp b/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
index ae847a803..8e2026b30 100644
--- a/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
@@ -20,8 +20,8 @@ namespace armarx::armem::server::plugins
ComponentPluginUser& parent = this->parent<ComponentPluginUser>();
properties->topic(memoryListener, parent.memoryListenerDefaultName);
- properties->optional(parent.longtermMemoryEnabled, "memory.ltm.00_enabled");
- parent.longtermMemory.defineProperties(properties, "memory");
+ properties->optional(parent.longtermMemoryEnabled, "mem.ltm.00_enabled");
+ parent.longtermMemory.defineProperties(properties, "mem.");
}
--
GitLab