Mercurial > hg > orthanc
changeset 6141:6cf5caab6117 attach-custom-data
renaming 1.12.99 as 1.12.8
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 30 May 2025 12:22:52 +0200 |
| parents | db4eb6c5ca65 |
| children | 93d408173903 |
| files | OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.cpp OrthancServer/Plugins/Engine/OrthancPlugins.cpp OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h OrthancServer/Plugins/Include/orthanc/OrthancDatabasePlugin.proto OrthancServer/Sources/Database/IDatabaseWrapper.h OrthancServer/Sources/Database/PrepareDatabase.sql OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp OrthancServer/Sources/ServerEnumerations.h |
| diffstat | 8 files changed, 51 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.cpp Wed May 28 19:28:59 2025 +0200 +++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.cpp Fri May 30 12:22:52 2025 +0200 @@ -577,7 +577,7 @@ request.mutable_add_attachment()->mutable_attachment()->set_compression_type(attachment.GetCompressionType()); request.mutable_add_attachment()->mutable_attachment()->set_compressed_size(attachment.GetCompressedSize()); request.mutable_add_attachment()->mutable_attachment()->set_compressed_hash(attachment.GetCompressedMD5()); - request.mutable_add_attachment()->mutable_attachment()->set_custom_data(attachment.GetCustomData()); // new in 1.12.99 + request.mutable_add_attachment()->mutable_attachment()->set_custom_data(attachment.GetCustomData()); // New in 1.12.8 request.mutable_add_attachment()->set_revision(revision); ExecuteTransaction(DatabasePluginMessages::OPERATION_ADD_ATTACHMENT, request);
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp Wed May 28 19:28:59 2025 +0200 +++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp Fri May 30 12:22:52 2025 +0200 @@ -904,7 +904,7 @@ }; - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 class PluginStorageAreaV3 : public IPluginStorageArea { private:
--- a/OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h Wed May 28 19:28:59 2025 +0200 +++ b/OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h Fri May 30 12:22:52 2025 +0200 @@ -121,7 +121,7 @@ #define ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER 1 #define ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER 12 -#define ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER 99 +#define ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER 8 #if !defined(ORTHANC_PLUGINS_VERSION_IS_ABOVE) @@ -469,20 +469,20 @@ _OrthancPluginService_SetMetricsIntegerValue = 43, /* New in Orthanc 1.12.1 */ _OrthancPluginService_SetCurrentThreadName = 44, /* New in Orthanc 1.12.2 */ _OrthancPluginService_LogMessage = 45, /* New in Orthanc 1.12.4 */ - _OrthancPluginService_AdoptAttachment = 46, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_GetAttachmentCustomData = 47, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_UpdateAttachmentCustomData = 48, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_StoreKeyValue = 49, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_DeleteKeyValue = 50, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_GetKeyValue = 51, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_CreateKeysValuesIterator = 52, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_FreeKeysValuesIterator = 53, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_KeysValuesIteratorNext = 54, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_KeysValuesIteratorGetKey = 55, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_KeysValuesIteratorGetValue = 56, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_EnqueueValue = 57, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_DequeueValue = 58, /* New in Orthanc 1.12.99 */ - _OrthancPluginService_GetQueueSize = 59, /* New in Orthanc 1.12.99 */ + _OrthancPluginService_AdoptAttachment = 46, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_GetAttachmentCustomData = 47, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_UpdateAttachmentCustomData = 48, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_StoreKeyValue = 49, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_DeleteKeyValue = 50, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_GetKeyValue = 51, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_CreateKeysValuesIterator = 52, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_FreeKeysValuesIterator = 53, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_KeysValuesIteratorNext = 54, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_KeysValuesIteratorGetKey = 55, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_KeysValuesIteratorGetValue = 56, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_EnqueueValue = 57, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_DequeueValue = 58, /* New in Orthanc 1.12.8 */ + _OrthancPluginService_GetQueueSize = 59, /* New in Orthanc 1.12.8 */ /* Registration of callbacks */ @@ -506,7 +506,7 @@ _OrthancPluginService_RegisterIncomingCStoreInstanceFilter = 1017, /* New in Orthanc 1.10.0 */ _OrthancPluginService_RegisterReceivedInstanceCallback = 1018, /* New in Orthanc 1.10.0 */ _OrthancPluginService_RegisterWebDavCollection = 1019, /* New in Orthanc 1.10.1 */ - _OrthancPluginService_RegisterStorageArea3 = 1020, /* New in Orthanc 1.12.99 */ + _OrthancPluginService_RegisterStorageArea3 = 1020, /* New in Orthanc 1.12.8 */ /* Sending answers to REST calls */ _OrthancPluginService_AnswerBuffer = 2000, @@ -806,7 +806,7 @@ OrthancPluginCompressionType_ZlibWithSize = 1, /*!< zlib, prefixed with uncompressed size (uint64_t) */ OrthancPluginCompressionType_Gzip = 2, /*!< Standard gzip compression */ OrthancPluginCompressionType_GzipWithSize = 3, /*!< gzip, prefixed with uncompressed size (uint64_t) */ - OrthancPluginCompressionType_None = 4, /*!< No compression (new in Orthanc 1.12.99) */ + OrthancPluginCompressionType_None = 4, /*!< No compression (new in Orthanc 1.12.8) */ _OrthancPluginCompressionType_INTERNAL = 0x7fffffff } OrthancPluginCompressionType;
--- a/OrthancServer/Plugins/Include/orthanc/OrthancDatabasePlugin.proto Wed May 28 19:28:59 2025 +0200 +++ b/OrthancServer/Plugins/Include/orthanc/OrthancDatabasePlugin.proto Fri May 30 12:22:52 2025 +0200 @@ -55,7 +55,7 @@ int32 compression_type = 5; // opaque "CompressionType" in Orthanc uint64 compressed_size = 6; string compressed_hash = 7; - string custom_data = 8; // added in v 1.12.99 + string custom_data = 8; // New in v 1.12.8 } enum ResourceType { @@ -172,9 +172,9 @@ bool has_measure_latency = 7; bool supports_find = 8; // New in Orthanc 1.12.5 bool has_extended_changes = 9; // New in Orthanc 1.12.5 - bool supports_key_value_stores = 10; // New in Orthanc 1.12.99 - bool supports_queues = 11; // New in Orthanc 1.12.99 - bool has_attachment_custom_data = 12; // New in Orthanc 1.12.99 + bool supports_key_value_stores = 10; // New in Orthanc 1.12.8 + bool supports_queues = 11; // New in Orthanc 1.12.8 + bool has_attachment_custom_data = 12; // New in Orthanc 1.12.8 } } @@ -330,15 +330,15 @@ OPERATION_FIND = 50; // New in Orthanc 1.12.5 OPERATION_GET_CHANGES_EXTENDED = 51; // New in Orthanc 1.12.5 OPERATION_COUNT_RESOURCES = 52; // New in Orthanc 1.12.5 - OPERATION_STORE_KEY_VALUE = 53; // New in Orthanc 1.12.99 - OPERATION_DELETE_KEY_VALUE = 54; // New in Orthanc 1.12.99 - OPERATION_GET_KEY_VALUE = 55; // New in Orthanc 1.12.99 - OPERATION_LIST_KEY_VALUES = 56; // New in Orthanc 1.12.99 - OPERATION_ENQUEUE_VALUE = 57; // New in Orthanc 1.12.99 - OPERATION_DEQUEUE_VALUE = 58; // New in Orthanc 1.12.99 - OPERATION_GET_QUEUE_SIZE = 59; // New in Orthanc 1.12.99 - OPERATION_GET_ATTACHMENT = 60; // New in Orthanc 1.12.99 - OPERATION_UPDATE_ATTACHMENT_CUSTOM_DATA = 61; // New in Orthanc 1.12.99 + OPERATION_STORE_KEY_VALUE = 53; // New in Orthanc 1.12.8 + OPERATION_DELETE_KEY_VALUE = 54; // New in Orthanc 1.12.8 + OPERATION_GET_KEY_VALUE = 55; // New in Orthanc 1.12.8 + OPERATION_LIST_KEY_VALUES = 56; // New in Orthanc 1.12.8 + OPERATION_ENQUEUE_VALUE = 57; // New in Orthanc 1.12.8 + OPERATION_DEQUEUE_VALUE = 58; // New in Orthanc 1.12.8 + OPERATION_GET_QUEUE_SIZE = 59; // New in Orthanc 1.12.8 + OPERATION_GET_ATTACHMENT = 60; // New in Orthanc 1.12.8 + OPERATION_UPDATE_ATTACHMENT_CUSTOM_DATA = 61; // New in Orthanc 1.12.8 }
--- a/OrthancServer/Sources/Database/IDatabaseWrapper.h Wed May 28 19:28:59 2025 +0200 +++ b/OrthancServer/Sources/Database/IDatabaseWrapper.h Fri May 30 12:22:52 2025 +0200 @@ -434,21 +434,21 @@ uint32_t limit, const std::set<ChangeType>& filterType) = 0; - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 virtual void StoreKeyValue(const std::string& storeId, const std::string& key, const std::string& value) = 0; - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 virtual void DeleteKeyValue(const std::string& storeId, const std::string& key) = 0; - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 virtual bool GetKeyValue(std::string& value, const std::string& storeId, const std::string& key) = 0; - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 virtual void ListKeysValues(std::list<std::string>& keys /* out */, std::list<std::string>& values /* out */, const std::string& storeId, @@ -456,16 +456,16 @@ const std::string& from /* only used if "first == false" */, uint64_t limit /* maximum number of elements */) = 0; - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 virtual void EnqueueValue(const std::string& queueId, const std::string& value) = 0; - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 virtual bool DequeueValue(std::string& value, const std::string& queueId, QueueOrigin origin) = 0; - // New in Orthanc 1.12.99, for statistics only + // New in Orthanc 1.12.8, for statistics only virtual uint64_t GetQueueSize(const std::string& queueId) = 0; };
--- a/OrthancServer/Sources/Database/PrepareDatabase.sql Wed May 28 19:28:59 2025 +0200 +++ b/OrthancServer/Sources/Database/PrepareDatabase.sql Fri May 30 12:22:52 2025 +0200 @@ -55,7 +55,7 @@ id INTEGER REFERENCES Resources(internalId) ON DELETE CASCADE, type INTEGER, value TEXT, - revision INTEGER, -- New in Orthanc 1.12.99 (added in InstallRevisionAndCustomData.sql) + revision INTEGER, -- New in Orthanc 1.12.8 (added in InstallRevisionAndCustomData.sql) PRIMARY KEY(id, type) ); @@ -68,8 +68,8 @@ compressionType INTEGER, uncompressedMD5 TEXT, -- New in Orthanc 0.7.3 (database v4) compressedMD5 TEXT, -- New in Orthanc 0.7.3 (database v4) - revision INTEGER, -- New in Orthanc 1.12.99 (added in InstallRevisionAndCustomData.sql) - customData TEXT, -- New in Orthanc 1.12.99 (added in InstallRevisionAndCustomData.sql) + revision INTEGER, -- New in Orthanc 1.12.8 (added in InstallRevisionAndCustomData.sql) + customData TEXT, -- New in Orthanc 1.12.8 (added in InstallRevisionAndCustomData.sql) PRIMARY KEY(id, fileType) ); @@ -179,7 +179,7 @@ -------------------------------------------------- --- new in Orthanc 1.12.99 ------------------------- equivalent to InstallRevisionAndCustomData.sql +-- new in Orthanc 1.12.8 ------------------------- equivalent to InstallRevisionAndCustomData.sql CREATE TABLE DeletedFiles( uuid TEXT NOT NULL, -- 0 @@ -203,7 +203,7 @@ --------------------------------------------------- --- new in Orthanc 1.12.99 ------------------------- equivalent to InstallKeyValueStoresAndQueues.sql +-- new in Orthanc 1.12.8 ------------------------- equivalent to InstallKeyValueStoresAndQueues.sql CREATE TABLE KeyValueStores( storeId TEXT NOT NULL, key TEXT NOT NULL,
--- a/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp Wed May 28 19:28:59 2025 +0200 +++ b/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp Fri May 30 12:22:52 2025 +0200 @@ -2181,7 +2181,7 @@ } } - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 virtual void ListKeysValues(std::list<std::string>& keys /* out */, std::list<std::string>& values /* out */, const std::string& storeId, @@ -2219,7 +2219,7 @@ } - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 virtual void EnqueueValue(const std::string& queueId, const std::string& value) ORTHANC_OVERRIDE { @@ -2230,7 +2230,7 @@ s.Run(); } - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 virtual bool DequeueValue(std::string& value, const std::string& queueId, QueueOrigin origin) ORTHANC_OVERRIDE @@ -2272,7 +2272,7 @@ } } - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 virtual uint64_t GetQueueSize(const std::string& queueId) ORTHANC_OVERRIDE { SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT COUNT(*) FROM Queues WHERE queueId=?"); @@ -2640,7 +2640,7 @@ db_.Execute(query); } - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 if (!transaction->LookupGlobalProperty(tmp, GlobalProperty_SQLiteHasCustomDataAndRevision, true /* unused in SQLite */) || tmp != "1") { @@ -2650,7 +2650,7 @@ db_.Execute(query); } - // New in Orthanc 1.12.99 + // New in Orthanc 1.12.8 if (!db_.DoesTableExist("KeyValueStores")) { LOG(INFO) << "Installing the \"KeyValueStores\" and \"Queues\" tables";
--- a/OrthancServer/Sources/ServerEnumerations.h Wed May 28 19:28:59 2025 +0200 +++ b/OrthancServer/Sources/ServerEnumerations.h Fri May 30 12:22:52 2025 +0200 @@ -171,7 +171,7 @@ GlobalProperty_AnonymizationSequence = 3, GlobalProperty_JobsRegistry = 5, GlobalProperty_GetTotalSizeIsFast = 6, // New in Orthanc 1.5.2 - GlobalProperty_SQLiteHasCustomDataAndRevision = 7, // New in Orthanc 1.12.99 + GlobalProperty_SQLiteHasCustomDataAndRevision = 7, // New in Orthanc 1.12.8 GlobalProperty_Modalities = 20, // New in Orthanc 1.5.0 GlobalProperty_Peers = 21, // New in Orthanc 1.5.0