Mercurial > hg > orthanc

changeset 6068:972d0c050132 attach-custom-data

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed 1.12.7 -> 1.12.99 for attach-custom-data features
author Alain Mazy <am@orthanc.team>
date Tue, 01 Apr 2025 16:40:28 +0200 (2 months ago)
parents 552bd2c56006
children 26e8abb19d56
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/PrepareDatabase.sql OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp OrthancServer/Sources/ServerEnumerations.h
diffstat 7 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.cpp	Tue Mar 25 21:57:45 2025 +0100
+++ b/OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.cpp	Tue Apr 01 16:40:28 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.7
+      request.mutable_add_attachment()->mutable_attachment()->set_custom_data(attachment.GetCustomData());        // new in 1.12.99
       request.mutable_add_attachment()->set_revision(revision);
 
       ExecuteTransaction(DatabasePluginMessages::OPERATION_ADD_ATTACHMENT, request);
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Tue Mar 25 21:57:45 2025 +0100
+++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Tue Apr 01 16:40:28 2025 +0200
@@ -904,7 +904,7 @@
     };
 
 
-    // New in Orthanc 1.12.7
+    // New in Orthanc 1.12.99
     class PluginStorageAreaV3 : public IPluginStorageArea
     {
     private:
--- a/OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h	Tue Mar 25 21:57:45 2025 +0100
+++ b/OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h	Tue Apr 01 16:40:28 2025 +0200
@@ -469,7 +469,7 @@
     _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.7 */
+    _OrthancPluginService_AdoptAttachment = 46,                     /* New in Orthanc 99 */
 
 
     /* Registration of callbacks */
@@ -493,7 +493,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.7 */
+    _OrthancPluginService_RegisterStorageArea3 = 1020,         /* New in Orthanc 1.12.99 */
 
     /* Sending answers to REST calls */
     _OrthancPluginService_AnswerBuffer = 2000,
@@ -793,7 +793,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.7) */
+    OrthancPluginCompressionType_None = 4,          /*!< No compression (new in Orthanc 1.12.99) */
 
     _OrthancPluginCompressionType_INTERNAL = 0x7fffffff
   } OrthancPluginCompressionType;
--- a/OrthancServer/Plugins/Include/orthanc/OrthancDatabasePlugin.proto	Tue Mar 25 21:57:45 2025 +0100
+++ b/OrthancServer/Plugins/Include/orthanc/OrthancDatabasePlugin.proto	Tue Apr 01 16:40:28 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.7
+  string  custom_data = 8;       // added in v 1.12.99
 }
 
 enum ResourceType {
--- a/OrthancServer/Sources/Database/PrepareDatabase.sql	Tue Mar 25 21:57:45 2025 +0100
+++ b/OrthancServer/Sources/Database/PrepareDatabase.sql	Tue Apr 01 16:40:28 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.7 (added in InstallRevisionAndCustomData.sql)
+       -- revision INTEGER,      -- New in Orthanc 1.12.99 (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.7 (added in InstallRevisionAndCustomData.sql)
-       -- customData TEXT,       -- New in Orthanc 1.12.7 (added in InstallRevisionAndCustomData.sql)
+       -- revision INTEGER,      -- New in Orthanc 1.12.99 (added in InstallRevisionAndCustomData.sql)
+       -- customData TEXT,       -- New in Orthanc 1.12.99 (added in InstallRevisionAndCustomData.sql)
        PRIMARY KEY(id, fileType)
        );              
 
--- a/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp	Tue Mar 25 21:57:45 2025 +0100
+++ b/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp	Tue Apr 01 16:40:28 2025 +0200
@@ -2414,7 +2414,7 @@
         }
       }
 
-      // New in Orthanc 1.12.7
+      // New in Orthanc 1.12.99
       if (version_ >= 6)
       {
         if (!transaction->LookupGlobalProperty(tmp, GlobalProperty_SQLiteHasCustomDataAndRevision, true /* unused in SQLite */) 
--- a/OrthancServer/Sources/ServerEnumerations.h	Tue Mar 25 21:57:45 2025 +0100
+++ b/OrthancServer/Sources/ServerEnumerations.h	Tue Apr 01 16:40:28 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.7
+    GlobalProperty_SQLiteHasCustomDataAndRevision = 7,     // New in Orthanc 1.12.99
     GlobalProperty_Modalities = 20,             // New in Orthanc 1.5.0
     GlobalProperty_Peers = 21,                  // New in Orthanc 1.5.0