From 3d1acea4d091dba0f9a52d2e35b5f3c447735d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com> Date: Thu, 26 Aug 2021 15:22:58 +0200 Subject: [PATCH] MAINT: rename file path to remote path --- include/caosdb/entity.h | 2 +- include/ccaosdb.h | 2 +- src/caosdb/entity.cpp | 2 +- src/ccaosdb.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/caosdb/entity.h b/include/caosdb/entity.h index 08a7be6..e6fd5d9 100644 --- a/include/caosdb/entity.h +++ b/include/caosdb/entity.h @@ -703,7 +703,7 @@ public: */ auto CopyTo(ProtoEntity *target) -> void; - auto SetFilePath(const std::string &path) -> void; + auto SetRemotePath(const std::string &path) -> void; inline auto HasFile() const -> bool { return !this->file_descriptor.local_path.empty(); } auto SetFileTransmissionRegistrationId(const std::string ®istration_id) -> void; inline auto SetFileTransmissionId(FileTransmissionId *file_transmission_id) -> void { diff --git a/include/ccaosdb.h b/include/ccaosdb.h index e643e0d..8ac122f 100644 --- a/include/ccaosdb.h +++ b/include/ccaosdb.h @@ -418,7 +418,7 @@ int caosdb_entity_entity_set_role(caosdb_entity_entity *entity, const char *role int caosdb_entity_entity_set_name(caosdb_entity_entity *entity, const char *name); int caosdb_entity_entity_set_description(caosdb_entity_entity *entity, const char *description); int caosdb_entity_entity_set_local_path(caosdb_entity_entity *entity, const char *name); -int caosdb_entity_entity_set_file_path(caosdb_entity_entity *entity, const char *name); +int caosdb_entity_entity_set_remote_path(caosdb_entity_entity *entity, const char *name); /** * Set the entity's datatype by name, and whether it is a reference or a list. */ diff --git a/src/caosdb/entity.cpp b/src/caosdb/entity.cpp index 3e14a90..4ebfef6 100644 --- a/src/caosdb/entity.cpp +++ b/src/caosdb/entity.cpp @@ -264,7 +264,7 @@ auto Entity::SetDataType(const std::string &new_data_type, bool list_type) -> St return SetDataType(DataType(new_data_type, list_type)); } -auto Entity::SetFilePath(const std::string &path) -> void { +auto Entity::SetRemotePath(const std::string &path) -> void { this->wrapped->mutable_file_descriptor()->set_path(path); } diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp index bd2cbf6..a4d9e35 100644 --- a/src/ccaosdb.cpp +++ b/src/ccaosdb.cpp @@ -606,7 +606,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR, *out = tmp; return 0; }) -// CAOSDB_ENTITY_GET(file_path, GetFilePath()) TODO(henrik) +// CAOSDB_ENTITY_GET(remote_path, GetRemotePath()) TODO(henrik) CAOSDB_ENTITY_GET(description, GetDescription()) ERROR_RETURN_CODE(GENERIC_ERROR, int caosdb_entity_entity_get_datatype(caosdb_entity_entity *entity, char **name, @@ -1007,7 +1007,7 @@ ERROR_RETURN_CODE(GENERIC_ERROR, CAOSDB_ENTITY_SET(name, name, wrapped_entity->SetName(std::string(name));) CAOSDB_ENTITY_SET(local_path, local_path, return wrapped_entity->SetLocalPath(boost::filesystem::path(local_path));) -CAOSDB_ENTITY_SET(file_path, file_path, wrapped_entity->SetFilePath(std::string(file_path));) +CAOSDB_ENTITY_SET(remote_path, remote_path, wrapped_entity->SetRemotePath(std::string(remote_path));) CAOSDB_ENTITY_SET(description, description, wrapped_entity->SetDescription(std::string(description));) ERROR_RETURN_CODE(GENERIC_ERROR, -- GitLab