# HG changeset patch # User Sebastien Jodogne # Date 1749750957 -7200 # Node ID 33f88747fe68de57a64f03143f955f29ab811e36 # Parent da92d3af3c5d6bffadc2c6c238d8bc378617e6b5 simplifying OrthancPluginAdoptAttachment() as OrthancPluginAdoptDicomInstance() diff -r da92d3af3c5d -r 33f88747fe68 OrthancServer/Plugins/Engine/OrthancPlugins.cpp --- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp Thu Jun 12 16:06:27 2025 +0200 +++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp Thu Jun 12 19:55:57 2025 +0200 @@ -2258,16 +2258,16 @@ sizeof(int32_t) != sizeof(OrthancPluginContentType) || sizeof(int32_t) != sizeof(OrthancPluginResourceType) || sizeof(int32_t) != sizeof(OrthancPluginChangeType) || + sizeof(int32_t) != sizeof(OrthancPluginCompressionType) || sizeof(int32_t) != sizeof(OrthancPluginImageFormat) || - sizeof(int32_t) != sizeof(OrthancPluginCompressionType) || sizeof(int32_t) != sizeof(OrthancPluginValueRepresentation) || sizeof(int32_t) != sizeof(OrthancPluginDicomToJsonFlags) || sizeof(int32_t) != sizeof(OrthancPluginDicomToJsonFormat) || sizeof(int32_t) != sizeof(OrthancPluginCreateDicomFlags) || - sizeof(int32_t) != sizeof(_OrthancPluginDatabaseAnswerType) || sizeof(int32_t) != sizeof(OrthancPluginIdentifierConstraint) || sizeof(int32_t) != sizeof(OrthancPluginInstanceOrigin) || sizeof(int32_t) != sizeof(OrthancPluginJobStepStatus) || + sizeof(int32_t) != sizeof(OrthancPluginJobStopReason) || sizeof(int32_t) != sizeof(OrthancPluginConstraintType) || sizeof(int32_t) != sizeof(OrthancPluginMetricsType) || sizeof(int32_t) != sizeof(OrthancPluginDicomWebBinaryMode) || @@ -2276,6 +2276,14 @@ sizeof(int32_t) != sizeof(OrthancPluginLoadDicomInstanceMode) || sizeof(int32_t) != sizeof(OrthancPluginLogLevel) || sizeof(int32_t) != sizeof(OrthancPluginLogCategory) || + sizeof(int32_t) != sizeof(OrthancPluginStoreStatus) || + sizeof(int32_t) != sizeof(OrthancPluginQueueOrigin) || + + // From OrthancCDatabasePlugin.h + sizeof(int32_t) != sizeof(_OrthancPluginDatabaseAnswerType) || + sizeof(int32_t) != sizeof(OrthancPluginDatabaseTransactionType) || + sizeof(int32_t) != sizeof(OrthancPluginDatabaseEventType) || + static_cast(OrthancPluginDicomToJsonFlags_IncludeBinary) != static_cast(DicomToJsonFlags_IncludeBinary) || static_cast(OrthancPluginDicomToJsonFlags_IncludePrivateTags) != static_cast(DicomToJsonFlags_IncludePrivateTags) || static_cast(OrthancPluginDicomToJsonFlags_IncludeUnknownTags) != static_cast(DicomToJsonFlags_IncludeUnknownTags) || @@ -4532,61 +4540,30 @@ reinterpret_cast(p.output)->SendMultipartItem(p.answer, p.answerSize, headers); } - // static FileInfo CreateFileInfoFromPluginAttachment(OrthancPluginAttachment* attachment) - // { - // return FileInfo(attachment->uuid, - // Orthanc::Plugins::Convert(attachment->contentType), - // attachment->uncompressedSize, - // attachment->uncompressedHash - // ) fileInfo() - // } - - static void Convert(FileInfo& info, - const OrthancPluginAttachment2& attachment) + void OrthancPlugins::ApplyAdoptDicomInstance(const _OrthancPluginAdoptDicomInstance& parameters) { - std::string uuid; - if (attachment.uuid != NULL) - { - uuid = attachment.uuid; - } - else - { - uuid = Toolbox::GenerateUuid(); - } - - info = FileInfo(uuid, - Orthanc::Plugins::Convert(static_cast(attachment.contentType)), - attachment.uncompressedSize, - attachment.uncompressedHash, - Orthanc::Plugins::Convert(static_cast(attachment.compressionType)), - attachment.compressedSize, - attachment.compressedHash); - - if (attachment.customData != NULL) - { - info.SetCustomData(attachment.customData, attachment.customDataSize); - } - } - - void OrthancPlugins::ApplyAdoptAttachment(const _OrthancPluginAdoptAttachment& parameters) - { - PImpl::ServerContextReference lock(*pimpl_); - FileInfo adoptedFile; - Convert(adoptedFile, *parameters.attachmentInfo); - - if (adoptedFile.GetContentType() == FileContentType_Dicom) - { - std::unique_ptr dicom(DicomInstanceToStore::CreateFromBuffer(parameters.buffer, parameters.bufferSize)); - dicom->SetOrigin(DicomInstanceOrigin::FromPlugins()); - - std::string resultPublicId; - - ServerContext::StoreResult result = lock.GetContext().AdoptAttachment(resultPublicId, *dicom, StoreInstanceMode_Default, adoptedFile); - - CopyToMemoryBuffer(parameters.attachmentUuid, adoptedFile.GetUuid()); - CopyToMemoryBuffer(parameters.createdResourceId, resultPublicId); - *(parameters.storeStatus) = Plugins::Convert(result.GetStatus()); - } + std::string md5; + Toolbox::ComputeMD5(md5, parameters.buffer, parameters.bufferSize); + + std::unique_ptr dicom(DicomInstanceToStore::CreateFromBuffer(parameters.buffer, parameters.bufferSize)); + dicom->SetOrigin(DicomInstanceOrigin::FromPlugins()); + + const std::string attachmentUuid = Toolbox::GenerateUuid(); + + FileInfo adoptedFile(attachmentUuid, FileContentType_Dicom, parameters.bufferSize, md5); + adoptedFile.SetCustomData(parameters.customData, parameters.customDataSize); + + std::string instanceId; + ServerContext::StoreResult result; + + { + PImpl::ServerContextReference lock(*pimpl_); + result = lock.GetContext().AdoptDicomInstance(instanceId, *dicom, StoreInstanceMode_Default, adoptedFile); + } + + CopyToMemoryBuffer(parameters.attachmentUuid, attachmentUuid); + CopyToMemoryBuffer(parameters.instanceId, instanceId); + *(parameters.storeStatus) = Plugins::Convert(result.GetStatus()); } static void CheckAttachmentCustomDataSupport(ServerContext& context) @@ -5740,10 +5717,10 @@ return true; } - case _OrthancPluginService_AdoptAttachment: - { - const _OrthancPluginAdoptAttachment& p = *reinterpret_cast(parameters); - ApplyAdoptAttachment(p); + case _OrthancPluginService_AdoptDicomInstance: + { + const _OrthancPluginAdoptDicomInstance& p = *reinterpret_cast(parameters); + ApplyAdoptDicomInstance(p); return true; } diff -r da92d3af3c5d -r 33f88747fe68 OrthancServer/Plugins/Engine/OrthancPlugins.h --- a/OrthancServer/Plugins/Engine/OrthancPlugins.h Thu Jun 12 16:06:27 2025 +0200 +++ b/OrthancServer/Plugins/Engine/OrthancPlugins.h Thu Jun 12 19:55:57 2025 +0200 @@ -224,7 +224,7 @@ void ApplyLoadDicomInstance(const _OrthancPluginLoadDicomInstance& parameters); - void ApplyAdoptAttachment(const _OrthancPluginAdoptAttachment& parameters); + void ApplyAdoptDicomInstance(const _OrthancPluginAdoptDicomInstance& parameters); void ApplyGetAttachmentCustomData(const _OrthancPluginGetAttachmentCustomData& parameters); diff -r da92d3af3c5d -r 33f88747fe68 OrthancServer/Plugins/Include/orthanc/OrthancCDatabasePlugin.h --- a/OrthancServer/Plugins/Include/orthanc/OrthancCDatabasePlugin.h Thu Jun 12 16:06:27 2025 +0200 +++ b/OrthancServer/Plugins/Include/orthanc/OrthancCDatabasePlugin.h Thu Jun 12 19:55:57 2025 +0200 @@ -80,6 +80,23 @@ } _OrthancPluginDatabaseAnswerType; + typedef enum + { + OrthancPluginDatabaseTransactionType_ReadOnly = 1, + OrthancPluginDatabaseTransactionType_ReadWrite = 2, + OrthancPluginDatabaseTransactionType_INTERNAL = 0x7fffffff + } OrthancPluginDatabaseTransactionType; + + + typedef enum + { + OrthancPluginDatabaseEventType_DeletedAttachment = 1, + OrthancPluginDatabaseEventType_DeletedResource = 2, + OrthancPluginDatabaseEventType_RemainingAncestor = 3, + OrthancPluginDatabaseEventType_INTERNAL = 0x7fffffff + } OrthancPluginDatabaseEventType; + + typedef struct { const char* uuid; @@ -899,7 +916,9 @@ OrthancPluginDatabaseContext* result = NULL; _OrthancPluginRegisterDatabaseBackend params; - if (sizeof(int32_t) != sizeof(_OrthancPluginDatabaseAnswerType)) + if (sizeof(int32_t) != sizeof(_OrthancPluginDatabaseAnswerType) || + sizeof(int32_t) != sizeof(OrthancPluginDatabaseTransactionType) || + sizeof(int32_t) != sizeof(OrthancPluginDatabaseEventType)) { return NULL; } @@ -951,7 +970,9 @@ OrthancPluginDatabaseContext* result = NULL; _OrthancPluginRegisterDatabaseBackendV2 params; - if (sizeof(int32_t) != sizeof(_OrthancPluginDatabaseAnswerType)) + if (sizeof(int32_t) != sizeof(_OrthancPluginDatabaseAnswerType) || + sizeof(int32_t) != sizeof(OrthancPluginDatabaseTransactionType) || + sizeof(int32_t) != sizeof(OrthancPluginDatabaseEventType)) { return NULL; } @@ -982,23 +1003,6 @@ **/ /*InvokeService(context, _OrthancPluginService_AdoptAttachment, ¶ms); + params.customData = customData; + params.customDataSize = customDataSize; + + return context->InvokeService(context, _OrthancPluginService_AdoptDicomInstance, ¶ms); } diff -r da92d3af3c5d -r 33f88747fe68 OrthancServer/Sources/ServerContext.cpp --- a/OrthancServer/Sources/ServerContext.cpp Thu Jun 12 16:06:27 2025 +0200 +++ b/OrthancServer/Sources/ServerContext.cpp Thu Jun 12 19:55:57 2025 +0200 @@ -636,10 +636,10 @@ adoptedFileNotUsed); } - ServerContext::StoreResult ServerContext::AdoptAttachment(std::string& resultPublicId, - DicomInstanceToStore& dicom, - StoreInstanceMode mode, - const FileInfo& adoptedFile) + ServerContext::StoreResult ServerContext::AdoptDicomInstance(std::string& resultPublicId, + DicomInstanceToStore& dicom, + StoreInstanceMode mode, + const FileInfo& adoptedFile) { return StoreAfterTranscoding(resultPublicId, dicom, diff -r da92d3af3c5d -r 33f88747fe68 OrthancServer/Sources/ServerContext.h --- a/OrthancServer/Sources/ServerContext.h Thu Jun 12 16:06:27 2025 +0200 +++ b/OrthancServer/Sources/ServerContext.h Thu Jun 12 19:55:57 2025 +0200 @@ -364,10 +364,10 @@ DicomInstanceToStore& dicom, StoreInstanceMode mode); - StoreResult AdoptAttachment(std::string& resultPublicId, - DicomInstanceToStore& dicom, - StoreInstanceMode mode, - const FileInfo& adoptedFile); + StoreResult AdoptDicomInstance(std::string& resultPublicId, + DicomInstanceToStore& dicom, + StoreInstanceMode mode, + const FileInfo& adoptedFile); StoreResult TranscodeAndStore(std::string& resultPublicId, DicomInstanceToStore* dicom,