Skip to content
Snippets Groups Projects
Commit 6e1a16d8 authored by florian's avatar florian
Browse files

Merge branch 'f-insert' of gitlab.indiscale.com:caosdb/src/caosdb-cpplib into f-insert

parents 7569aaa3 04d44a2d
Branches
Tags
1 merge request!4ENH: Allow insertion and deletion of single entities
...@@ -468,7 +468,7 @@ auto ConfigurationManager::InitializeDefaults() -> int { // NOLINT ...@@ -468,7 +468,7 @@ auto ConfigurationManager::InitializeDefaults() -> int { // NOLINT
// find the configuration file... // find the configuration file...
std::unique_ptr<path> configuration_file_path; std::unique_ptr<path> configuration_file_path;
for (const char* const &configuration_file : for (const char *const &configuration_file :
caosdb::LIBCAOSDB_CONFIGURATION_FILES_PRECEDENCE) { caosdb::LIBCAOSDB_CONFIGURATION_FILES_PRECEDENCE) {
if (strcmp(configuration_file, "$CAOSDB_CLIENT_CONFIGURATION") == 0) { if (strcmp(configuration_file, "$CAOSDB_CLIENT_CONFIGURATION") == 0) {
// user specified a file via the environment variable // user specified a file via the environment variable
......
...@@ -80,6 +80,9 @@ Entity::Entity() : wrapped(Entity::CreateProtoEntity()) { ...@@ -80,6 +80,9 @@ Entity::Entity() : wrapped(Entity::CreateProtoEntity()) {
Entity::Entity(IdResponse *idResponse) : Entity() { Entity::Entity(IdResponse *idResponse) : Entity() {
this->wrapped->set_id(idResponse->id()); this->wrapped->set_id(idResponse->id());
this->wrapped->mutable_errors()->Swap(idResponse->mutable_entity_errors()); this->wrapped->mutable_errors()->Swap(idResponse->mutable_entity_errors());
this->wrapped->mutable_warnings()->Swap(
idResponse->mutable_entity_warnings());
this->wrapped->mutable_infos()->Swap(idResponse->mutable_entity_infos());
} }
auto Entity::SetId(const std::string &id) -> void { this->wrapped->set_id(id); } auto Entity::SetId(const std::string &id) -> void { this->wrapped->set_id(id); }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment