Mercurial > hg > orthanc
view OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp @ 5816:3f10350b26da
DICOMWeb Json formatter: improve support for ill-formed DS values + DS values are now represented as strings instead of doubles
author | Alain Mazy <am@orthanc.team> |
---|---|
date | Wed, 25 Sep 2024 19:36:43 +0200 |
parents | f7adfb22e20e |
children |
line wrap: on
line source
/** * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium * Copyright (C) 2017-2023 Osimis S.A., Belgium * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. **/ #include "../PrecompiledHeadersServer.h" #include "DicomModalityStoreJob.h" #include "../../../OrthancFramework/Sources/Compatibility.h" #include "../../../OrthancFramework/Sources/DicomNetworking/DicomAssociation.h" #include "../../../OrthancFramework/Sources/Logging.h" #include "../../../OrthancFramework/Sources/SerializationToolbox.h" #include "../ServerContext.h" #include "../StorageCommitmentReports.h" namespace Orthanc { void DicomModalityStoreJob::OpenConnection() { if (connection_.get() == NULL) { connection_.reset(new DicomStoreUserConnection(parameters_)); } } bool DicomModalityStoreJob::HandleInstance(const std::string& instance) { assert(IsStarted()); OpenConnection(); LOG(INFO) << "Sending instance " << instance << " to modality \"" << parameters_.GetRemoteModality().GetApplicationEntityTitle() << "\""; std::string dicom; try { context_.ReadDicom(dicom, instance); } catch (OrthancException& e) { LOG(WARNING) << "An instance was removed after the job was issued: " << instance; return false; } std::string sopClassUid, sopInstanceUid; context_.StoreWithTranscoding(sopClassUid, sopInstanceUid, *connection_, dicom, HasMoveOriginator(), moveOriginatorAet_, moveOriginatorId_); if (storageCommitment_) { sopClassUids_.push_back(sopClassUid); sopInstanceUids_.push_back(sopInstanceUid); if (sopClassUids_.size() != sopInstanceUids_.size() || sopClassUids_.size() > GetInstancesCount()) { throw OrthancException(ErrorCode_InternalError); } if (sopClassUids_.size() == GetInstancesCount()) { assert(IsStarted()); connection_.reset(NULL); const std::string& remoteAet = parameters_.GetRemoteModality().GetApplicationEntityTitle(); LOG(INFO) << "Sending storage commitment request to modality: " << remoteAet; // Create a "pending" storage commitment report BEFORE the // actual SCU call in order to avoid race conditions context_.GetStorageCommitmentReports().Store( transactionUid_, new StorageCommitmentReports::Report(remoteAet)); std::vector<std::string> a(sopClassUids_.begin(), sopClassUids_.end()); std::vector<std::string> b(sopInstanceUids_.begin(), sopInstanceUids_.end()); DicomAssociation::RequestStorageCommitment(parameters_, transactionUid_, a, b); } } //boost::this_thread::sleep(boost::posix_time::milliseconds(500)); return true; } bool DicomModalityStoreJob::HandleTrailingStep() { throw OrthancException(ErrorCode_InternalError); } DicomModalityStoreJob::DicomModalityStoreJob(ServerContext& context) : context_(context), moveOriginatorId_(0), // By default, not a C-MOVE storageCommitment_(false) // By default, no storage commitment { ResetStorageCommitment(); } void DicomModalityStoreJob::SetLocalAet(const std::string& aet) { if (IsStarted()) { throw OrthancException(ErrorCode_BadSequenceOfCalls); } else { parameters_.SetLocalApplicationEntityTitle(aet); } } void DicomModalityStoreJob::SetRemoteModality(const RemoteModalityParameters& remote) { if (IsStarted()) { throw OrthancException(ErrorCode_BadSequenceOfCalls); } else { parameters_.SetRemoteModality(remote); } } void DicomModalityStoreJob::SetTimeout(uint32_t seconds) { if (IsStarted()) { throw OrthancException(ErrorCode_BadSequenceOfCalls); } else { parameters_.SetTimeout(seconds); } } const std::string& DicomModalityStoreJob::GetMoveOriginatorAet() const { if (HasMoveOriginator()) { return moveOriginatorAet_; } else { throw OrthancException(ErrorCode_BadSequenceOfCalls); } } uint16_t DicomModalityStoreJob::GetMoveOriginatorId() const { if (HasMoveOriginator()) { return moveOriginatorId_; } else { throw OrthancException(ErrorCode_BadSequenceOfCalls); } } void DicomModalityStoreJob::SetMoveOriginator(const std::string& aet, int id) { if (IsStarted()) { throw OrthancException(ErrorCode_BadSequenceOfCalls); } else if (id < 0 || id >= 65536) { throw OrthancException(ErrorCode_ParameterOutOfRange); } else { moveOriginatorId_ = static_cast<uint16_t>(id); moveOriginatorAet_ = aet; } } void DicomModalityStoreJob::Stop(JobStopReason reason) // For pausing jobs { connection_.reset(NULL); } void DicomModalityStoreJob::ResetStorageCommitment() { if (storageCommitment_) { transactionUid_ = Toolbox::GenerateDicomPrivateUniqueIdentifier(); sopClassUids_.clear(); sopInstanceUids_.clear(); } } void DicomModalityStoreJob::Reset() { SetOfInstancesJob::Reset(); /** * "After the N-EVENT-REPORT has been sent, the Transaction UID is * no longer active and shall not be reused for other * transactions." => Need to reset the transaction UID here * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.3.html **/ ResetStorageCommitment(); } void DicomModalityStoreJob::EnableStorageCommitment(bool enabled) { storageCommitment_ = enabled; ResetStorageCommitment(); } void DicomModalityStoreJob::GetPublicContent(Json::Value& value) { SetOfInstancesJob::GetPublicContent(value); value["LocalAet"] = parameters_.GetLocalApplicationEntityTitle(); value["RemoteAet"] = parameters_.GetRemoteModality().GetApplicationEntityTitle(); if (HasMoveOriginator()) { value["MoveOriginatorAET"] = GetMoveOriginatorAet(); value["MoveOriginatorID"] = GetMoveOriginatorId(); } if (storageCommitment_) { value["StorageCommitmentTransactionUID"] = transactionUid_; } } static const char* MOVE_ORIGINATOR_AET = "MoveOriginatorAet"; static const char* MOVE_ORIGINATOR_ID = "MoveOriginatorId"; static const char* STORAGE_COMMITMENT = "StorageCommitment"; DicomModalityStoreJob::DicomModalityStoreJob(ServerContext& context, const Json::Value& serialized) : SetOfInstancesJob(serialized), context_(context) { moveOriginatorAet_ = SerializationToolbox::ReadString(serialized, MOVE_ORIGINATOR_AET); moveOriginatorId_ = static_cast<uint16_t> (SerializationToolbox::ReadUnsignedInteger(serialized, MOVE_ORIGINATOR_ID)); EnableStorageCommitment(SerializationToolbox::ReadBoolean(serialized, STORAGE_COMMITMENT)); parameters_ = DicomAssociationParameters::UnserializeJob(serialized); } bool DicomModalityStoreJob::Serialize(Json::Value& target) { if (!SetOfInstancesJob::Serialize(target)) { return false; } else { parameters_.SerializeJob(target); target[MOVE_ORIGINATOR_AET] = moveOriginatorAet_; target[MOVE_ORIGINATOR_ID] = moveOriginatorId_; target[STORAGE_COMMITMENT] = storageCommitment_; return true; } } }