changeset 6107:d71be7893e49 attach-custom-data

rename
author Alain Mazy <am@orthanc.team>
date Tue, 13 May 2025 14:10:30 +0200
parents 49674012ab49
children 21370b265a86
files OrthancServer/Plugins/Engine/OrthancPlugins.cpp OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h
diffstat 2 files changed, 28 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Fri May 09 16:14:42 2025 +0200
+++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Tue May 13 14:10:30 2025 +0200
@@ -4693,14 +4693,14 @@
     PImpl::ServerContextReference lock(*pimpl_);
     std::string value(parameters.value, parameters.valueSize);
 
-    lock.GetContext().GetIndex().StoreKeyValue(parameters.pluginIdentifier, parameters.key, value);
+    lock.GetContext().GetIndex().StoreKeyValue(parameters.storeId, parameters.key, value);
   }
 
   void OrthancPlugins::ApplyDeleteKeyValue(const _OrthancPluginDeleteKeyValue& parameters)
   {
     PImpl::ServerContextReference lock(*pimpl_);
 
-    lock.GetContext().GetIndex().DeleteKeyValue(parameters.pluginIdentifier, parameters.key);
+    lock.GetContext().GetIndex().DeleteKeyValue(parameters.storeId, parameters.key);
   }
 
   bool OrthancPlugins::ApplyGetKeyValue(const _OrthancPluginGetKeyValue& parameters)
@@ -4709,7 +4709,7 @@
 
     std::string value;
 
-    if (lock.GetContext().GetIndex().GetKeyValue(value, parameters.pluginIdentifier, parameters.key))
+    if (lock.GetContext().GetIndex().GetKeyValue(value, parameters.storeId, parameters.key))
     {
       CopyToMemoryBuffer(*parameters.value, value.size() > 0 ? value.c_str() : NULL, value.size());
       return true;
@@ -4732,7 +4732,7 @@
     PImpl::ServerContextReference lock(*pimpl_);
     std::string value(parameters.value, parameters.valueSize);
 
-    lock.GetContext().GetIndex().EnqueueValue(parameters.pluginIdentifier, value);
+    lock.GetContext().GetIndex().EnqueueValue(parameters.queueId, value);
   }
 
   bool OrthancPlugins::ApplyDequeueValue(const _OrthancPluginDequeueValue& parameters)
@@ -4741,7 +4741,7 @@
 
     std::string value;
 
-    if (lock.GetContext().GetIndex().DequeueValue(value, parameters.pluginIdentifier, Plugins::Convert(parameters.origin)))
+    if (lock.GetContext().GetIndex().DequeueValue(value, parameters.queueId, Plugins::Convert(parameters.origin)))
     {
       CopyToMemoryBuffer(*parameters.value, value.size() > 0 ? value.c_str() : NULL, value.size());
       return true;
--- a/OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h	Fri May 09 16:14:42 2025 +0200
+++ b/OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h	Tue May 13 14:10:30 2025 +0200
@@ -9839,7 +9839,7 @@
 
   typedef struct
   {
-    const char*                   pluginIdentifier;
+    const char*                   storeId;
     const char*                   key;
     const char*                   value;
     uint64_t                      valueSize;
@@ -9849,20 +9849,20 @@
    * @brief Tell Orthanc to store a key-value in its store.
    *
    * @param context The Orthanc plugin context, as received by OrthancPluginInitialize().
-   * @param pluginIdentifier A unique identifier identifying both the plugin and the store
-   * @param key The key of the value to store (Note: pluginIdentifier + key must be unique)
+   * @param storeId A unique identifier identifying both the plugin and the store
+   * @param key The key of the value to store (Note: storeId + key must be unique)
    * @param value The value to store
    * @param valueSize The lenght of the value to store
    **/
   ORTHANC_PLUGIN_INLINE OrthancPluginErrorCode OrthancPluginStoreKeyValue(
     OrthancPluginContext*         context,
-    const char*                   pluginIdentifier, /* in */
+    const char*                   storeId, /* in */
     const char*                   key, /* in */
     const char*                   value, /* in */
     uint64_t                      valueSize /* in */)
   {
     _OrthancPluginStoreKeyValue params;
-    params.pluginIdentifier = pluginIdentifier;
+    params.storeId = storeId;
     params.key = key;
     params.value = value;
     params.valueSize = valueSize;
@@ -9872,7 +9872,7 @@
 
   typedef struct
   {
-    const char*                   pluginIdentifier;
+    const char*                   storeId;
     const char*                   key;
   } _OrthancPluginDeleteKeyValue;
   
@@ -9880,16 +9880,16 @@
    * @brief Tell Orthanc to delete a key-value from its store.
    *
    * @param context The Orthanc plugin context, as received by OrthancPluginInitialize().
-   * @param pluginIdentifier A unique identifier identifying both the plugin and the store
-   * @param key The key of the value to store (Note: pluginIdentifier + key must be unique)
+   * @param storeId A unique identifier identifying both the plugin and the store
+   * @param key The key of the value to store (Note: storeId + key must be unique)
    **/
   ORTHANC_PLUGIN_INLINE OrthancPluginErrorCode OrthancPluginDeleteKeyValue(
     OrthancPluginContext*         context,
-    const char*                   pluginIdentifier, /* in */
+    const char*                   storeId, /* in */
     const char*                   key /* in */)
   {
     _OrthancPluginDeleteKeyValue params;
-    params.pluginIdentifier = pluginIdentifier;
+    params.storeId = storeId;
     params.key = key;
 
     return context->InvokeService(context, _OrthancPluginService_DeleteKeyValue, &params);
@@ -9897,7 +9897,7 @@
 
   typedef struct
   {
-    const char*                   pluginIdentifier;
+    const char*                   storeId;
     const char*                   key;
     OrthancPluginMemoryBuffer*    value;
   } _OrthancPluginGetKeyValue;
@@ -9906,18 +9906,18 @@
    * @brief Get the value associated to this key in the key-value store.
    *
    * @param context The Orthanc plugin context, as received by OrthancPluginInitialize().
-   * @param pluginIdentifier A unique identifier identifying both the plugin and the store
-   * @param key The key of the value to retrieve from the store (Note: pluginIdentifier + key must be unique)
+   * @param storeId A unique identifier identifying both the plugin and the store
+   * @param key The key of the value to retrieve from the store (Note: storeId + key must be unique)
    * @param value The value retrieved from the store
    **/
   ORTHANC_PLUGIN_INLINE OrthancPluginErrorCode OrthancPluginGetKeyValue(
     OrthancPluginContext*         context,
-    const char*                   pluginIdentifier, /* in */
+    const char*                   storeId, /* in */
     const char*                   key, /* in */
     OrthancPluginMemoryBuffer*    value /* out */)
   {
     _OrthancPluginGetKeyValue params;
-    params.pluginIdentifier = pluginIdentifier;
+    params.storeId = storeId;
     params.key = key;
     params.value = value;
 
@@ -9927,7 +9927,7 @@
 
   typedef struct
   {
-    const char*                   pluginIdentifier;
+    const char*                   queueId;
     const char*                   value;
     uint64_t                      valueSize;
   } _OrthancPluginEnqueueValue;
@@ -9936,18 +9936,18 @@
    * @brief Tell Orthanc to store a value in a queue.
    *
    * @param context The Orthanc plugin context, as received by OrthancPluginInitialize().
-   * @param pluginIdentifier A unique identifier identifying both the plugin and the queue
+   * @param queueId A unique identifier identifying both the plugin and the queue
    * @param value The value to store
    * @param valueSize The lenght of the value to store
    **/
   ORTHANC_PLUGIN_INLINE OrthancPluginErrorCode OrthancPluginEnqueueValue(
     OrthancPluginContext*         context,
-    const char*                   pluginIdentifier, /* in */
+    const char*                   queueId, /* in */
     const char*                   value, /* in */
     uint64_t                      valueSize /* in */)
   {
     _OrthancPluginEnqueueValue params;
-    params.pluginIdentifier = pluginIdentifier;
+    params.queueId = queueId;
     params.value = value;
     params.valueSize = valueSize;
 
@@ -9956,7 +9956,7 @@
 
   typedef struct
   {
-    const char*                   pluginIdentifier;
+    const char*                   queueId;
     OrthancPluginQueueOrigin      origin;
     OrthancPluginMemoryBuffer*    value;
   } _OrthancPluginDequeueValue;
@@ -9965,18 +9965,18 @@
    * @brief Dequeue a value from a queue.
    *
    * @param context The Orthanc plugin context, as received by OrthancPluginInitialize().
-   * @param pluginIdentifier A unique identifier identifying both the plugin and the store
+   * @param queueId A unique identifier identifying both the plugin and the store
    * @param origin The extremity of the queue the value is dequeue from (back for LIFO or front for FIFO)
    * @param value The value retrieved from the queue
    **/
   ORTHANC_PLUGIN_INLINE OrthancPluginErrorCode OrthancPluginDequeueValue(
     OrthancPluginContext*         context,
-    const char*                   pluginIdentifier, /* in */
+    const char*                   queueId, /* in */
     OrthancPluginQueueOrigin      origin, /* in */
     OrthancPluginMemoryBuffer*    value /* out */)
   {
     _OrthancPluginDequeueValue params;
-    params.pluginIdentifier = pluginIdentifier;
+    params.queueId = queueId;
     params.origin = origin;
     params.value = value;