changeset 687:28e7b1270486 attach-custom-data

styling
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 12 Jun 2025 16:13:57 +0200
parents 88b03f7120f0
children b904eb3d987d
files Framework/Plugins/DatabaseBackendAdapterV4.cpp
diffstat 1 files changed, 19 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Plugins/DatabaseBackendAdapterV4.cpp	Thu Jun 12 16:07:26 2025 +0200
+++ b/Framework/Plugins/DatabaseBackendAdapterV4.cpp	Thu Jun 12 16:13:57 2025 +0200
@@ -493,16 +493,12 @@
       }
 
       case Orthanc::DatabasePluginMessages::OPERATION_CLOSE:
-      {
         pool.CloseConnections();
         break;
-      }
 
       case Orthanc::DatabasePluginMessages::OPERATION_FLUSH_TO_DISK:
-      {
         // Raise an exception since "set_supports_flush_to_disk(false)"
         throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
-      }
 
       case Orthanc::DatabasePluginMessages::OPERATION_START_TRANSACTION:
       {
@@ -690,16 +686,12 @@
     switch (request.operation())
     {
       case Orthanc::DatabasePluginMessages::OPERATION_ROLLBACK:
-      {
         manager.RollbackTransaction();
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_COMMIT:
-      {
         manager.CommitTransaction();
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_ADD_ATTACHMENT:
       {
@@ -721,17 +713,14 @@
 
         break;
       }
+
       case Orthanc::DatabasePluginMessages::OPERATION_CLEAR_CHANGES:
-      {
         backend.ClearChanges(manager);
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_CLEAR_EXPORTED_RESOURCES:
-      {
         backend.ClearExportedResources(manager);
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_DELETE_ATTACHMENT:
       {
@@ -741,10 +730,8 @@
       }
       
       case Orthanc::DatabasePluginMessages::OPERATION_DELETE_METADATA:
-      {
         backend.DeleteMetadata(manager, request.delete_metadata().id(), request.delete_metadata().type());
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_DELETE_RESOURCE:
       {
@@ -814,6 +801,7 @@
         response.mutable_get_changes()->set_done(done);
         break;
       }
+
 #if ORTHANC_PLUGINS_HAS_CHANGES_EXTENDED == 1
       case Orthanc::DatabasePluginMessages::OPERATION_GET_CHANGES_EXTENDED:
       {
@@ -921,16 +909,12 @@
       }
       
       case Orthanc::DatabasePluginMessages::OPERATION_GET_TOTAL_COMPRESSED_SIZE:
-      {
         response.mutable_get_total_compressed_size()->set_size(backend.GetTotalCompressedSize(manager));
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_GET_TOTAL_UNCOMPRESSED_SIZE:
-      {
         response.mutable_get_total_uncompressed_size()->set_size(backend.GetTotalUncompressedSize(manager));
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_IS_PROTECTED_PATIENT:
       {
@@ -954,16 +938,13 @@
       }
       
       case Orthanc::DatabasePluginMessages::OPERATION_LOG_CHANGE:
-      {
         backend.LogChange(manager, request.log_change().change_type(),
                           request.log_change().resource_id(),
                           Convert(request.log_change().resource_type()),
                           request.log_change().date().c_str());
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_LOG_EXPORTED_RESOURCE:
-      {
         backend.LogExportedResource(manager,
                                     Convert(request.log_exported_resource().resource_type()),
                                     request.log_exported_resource().public_id().c_str(),
@@ -974,7 +955,6 @@
                                     request.log_exported_resource().series_instance_uid().c_str(),
                                     request.log_exported_resource().sop_instance_uid().c_str());
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_LOOKUP_ATTACHMENT:
       {
@@ -1120,34 +1100,26 @@
       }
       
       case Orthanc::DatabasePluginMessages::OPERATION_SET_GLOBAL_PROPERTY:
-      {
         backend.SetGlobalProperty(manager, request.set_global_property().server_id().c_str(),
                                   request.set_global_property().property(),
                                   request.set_global_property().value().c_str());
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_CLEAR_MAIN_DICOM_TAGS:
-      {
         backend.ClearMainDicomTags(manager, request.clear_main_dicom_tags().id());
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_SET_METADATA:
-      {
         backend.SetMetadata(manager, request.set_metadata().id(),
                             request.set_metadata().metadata_type(),
                             request.set_metadata().value().c_str(),
                             request.set_metadata().revision());
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_SET_PROTECTED_PATIENT:
-      {
         backend.SetProtectedPatient(manager, request.set_protected_patient().patient_id(),
                                     request.set_protected_patient().protected_patient());
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_IS_DISK_SIZE_ABOVE:
       {
@@ -1157,10 +1129,8 @@
       }
       
       case Orthanc::DatabasePluginMessages::OPERATION_LOOKUP_RESOURCES:
-      {
         ApplyLookupResources(*response.mutable_lookup_resources(), request.lookup_resources(), backend, manager);
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_CREATE_INSTANCE:
       {
@@ -1262,10 +1232,8 @@
       }
       
       case Orthanc::DatabasePluginMessages::OPERATION_GET_LAST_CHANGE_INDEX:
-      {
         response.mutable_get_last_change_index()->set_result(backend.GetLastChangeIndex(manager));
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_LOOKUP_RESOURCE_AND_PARENT:
       {
@@ -1314,16 +1282,12 @@
       }
       
       case Orthanc::DatabasePluginMessages::OPERATION_ADD_LABEL:
-      {
         backend.AddLabel(manager, request.add_label().id(), request.add_label().label());
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_REMOVE_LABEL:
-      {
         backend.RemoveLabel(manager, request.remove_label().id(), request.remove_label().label());
         break;
-      }
       
       case Orthanc::DatabasePluginMessages::OPERATION_LIST_LABELS:
       {
@@ -1349,26 +1313,21 @@
       
 #if ORTHANC_PLUGINS_HAS_INTEGRATED_FIND == 1
       case Orthanc::DatabasePluginMessages::OPERATION_FIND:
-      {
         backend.ExecuteFind(response, manager, request.find());
         break;
-      }
 
       case Orthanc::DatabasePluginMessages::OPERATION_COUNT_RESOURCES:
-      {
         backend.ExecuteCount(response, manager, request.find());
         break;
-      }
 #endif
 
 #if ORTHANC_PLUGINS_HAS_KEY_VALUE_STORES == 1
       case Orthanc::DatabasePluginMessages::OPERATION_STORE_KEY_VALUE:
-      {
         backend.StoreKeyValue(manager, 
                               request.store_key_value().store_id(),
                               request.store_key_value().key(),
                               request.store_key_value().value());
-      }; break;
+        break;
 
       case Orthanc::DatabasePluginMessages::OPERATION_GET_KEY_VALUE:
       {
@@ -1382,31 +1341,27 @@
         {
           response.mutable_get_key_value()->set_value(value);
         }
-      }; break;
+        break;
+      }
 
       case Orthanc::DatabasePluginMessages::OPERATION_DELETE_KEY_VALUE:
-      {
         backend.DeleteKeyValue(manager, 
                                request.delete_key_value().store_id(),
                                request.delete_key_value().key());
-      }; break;
+        break;
 
       case Orthanc::DatabasePluginMessages::OPERATION_LIST_KEY_VALUES:
-      {
-        backend.ListKeysValues(response, 
-                               manager, 
-                               request.list_keys_values());
-      }; break;
+        backend.ListKeysValues(response, manager, request.list_keys_values());
+        break;
 
 #endif
 
 #if ORTHANC_PLUGINS_HAS_QUEUES == 1
       case Orthanc::DatabasePluginMessages::OPERATION_ENQUEUE_VALUE:
-      {
         backend.EnqueueValue(manager,
                              request.enqueue_value().queue_id(),
                              request.enqueue_value().value());
-      }; break;
+        break;
 
       case Orthanc::DatabasePluginMessages::OPERATION_DEQUEUE_VALUE:
       {
@@ -1420,14 +1375,17 @@
         {
           response.mutable_dequeue_value()->set_value(value);
         }
-      }; break;
+
+        break;
+      }
 
       case Orthanc::DatabasePluginMessages::OPERATION_GET_QUEUE_SIZE:
       {
         uint64_t size = backend.GetQueueSize(manager,
                                              request.get_queue_size().queue_id());
         response.mutable_get_queue_size()->set_size(size);
-      }; break;
+        break;
+      }
 
 #endif
 
@@ -1437,15 +1395,14 @@
         std::string customData;
         backend.GetAttachmentCustomData(customData, manager, request.get_attachment_custom_data().uuid());
         response.mutable_get_attachment_custom_data()->set_custom_data(customData);
-      }; break;
+        break;
+      }
 
       case Orthanc::DatabasePluginMessages::OPERATION_SET_ATTACHMENT_CUSTOM_DATA:
-      {
         backend.SetAttachmentCustomData(manager,
                                         request.set_attachment_custom_data().uuid(),
                                         request.set_attachment_custom_data().custom_data());
-      }; break;
-
+        break;
 #endif
 
       default:
@@ -1494,8 +1451,8 @@
         }
           
         default:
-          LOG(ERROR) << "Not implemented request type from protobuf: " << request.type();
-          break;
+          throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "Not implemented request type from protobuf: " +
+                                          boost::lexical_cast<std::string>(request.type()));
       }
 
       std::string s;