Mercurial > hg > orthanc
view OrthancServer/Scheduler/StoreScuCommand.cpp @ 2445:6e5bc5c6d1a4
Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005)
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 14 Dec 2017 13:02:06 +0100 |
parents | a3a65de1840f |
children | 878b59270859 |
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 Osimis, 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. * * In addition, as a special exception, the copyright holders of this * program give permission to link the code of its release with the * OpenSSL project's "OpenSSL" library (or with modified versions of it * that use the same license as the "OpenSSL" library), and distribute * the linked executables. You must obey the GNU General Public License * in all respects for all of the code used other than "OpenSSL". If you * modify file(s) with this exception, you may extend this exception to * your version of the file(s), but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from your * version. If you delete this exception statement from all source files * in the program, then also delete it here. * * 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 "StoreScuCommand.h" #include "../../Core/Logging.h" namespace Orthanc { StoreScuCommand::StoreScuCommand(ServerContext& context, const std::string& localAet, const RemoteModalityParameters& modality, bool ignoreExceptions) : context_(context), modality_(modality), ignoreExceptions_(ignoreExceptions), localAet_(localAet), moveOriginatorID_(0) { } void StoreScuCommand::SetMoveOriginator(const std::string& aet, uint16_t id) { moveOriginatorAET_ = aet; moveOriginatorID_ = id; } bool StoreScuCommand::Apply(ListOfStrings& outputs, const ListOfStrings& inputs) { ReusableDicomUserConnection::Locker locker(context_.GetReusableDicomUserConnection(), localAet_, modality_); for (ListOfStrings::const_iterator it = inputs.begin(); it != inputs.end(); ++it) { LOG(INFO) << "Sending resource " << *it << " to modality \"" << modality_.GetApplicationEntityTitle() << "\""; try { std::string dicom; context_.ReadDicom(dicom, *it); locker.GetConnection().Store(dicom, moveOriginatorAET_, moveOriginatorID_); // Only chain with other commands if this command succeeds outputs.push_back(*it); } catch (OrthancException& e) { // Ignore transmission errors (e.g. if the remote modality is // powered off) LOG(ERROR) << "Unable to forward to a modality in a Lua script (instance " << *it << "): " << e.What(); if (!ignoreExceptions_) { throw; } } } return true; } }