orthanc: OrthancServer/Sources/OrthancGetRequestHandler.cpp annotate

annotate OrthancServer/Sources/OrthancGetRequestHandler.cpp @ 4257:c046d559edb3

Fix reporting of client-side store warnings/errors in C-GET SCP

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 20 Oct 2020 09:52:42 +0200
parents	318c16cfccab
children	6f5d4bfb2c90

rev	line source
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	1 /**
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
3970 4d1dcdf5c57e fix date in some files Sebastien Jodogne <s.jodogne@gmail.com> parents: 3966 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	6 *
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	10 * License, or (at your option) any later version.
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	11 *
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	13 * program give permission to link the code of its release with the
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	22 * in the program, then also delete it here.
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	23 *
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	27 * General Public License for more details.
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	28 *
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	31 **/
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	32
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	33 #include "PrecompiledHeadersServer.h"
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	34 #include "OrthancGetRequestHandler.h"
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	35
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	36 #include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	37 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	38 #include "../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	39 #include "../../OrthancFramework/Sources/MetricsRegistry.h"
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	40 #include "OrthancConfiguration.h"
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	41 #include "ServerContext.h"
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	42 #include "ServerJobs/DicomModalityStoreJob.h"
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	43
3963 3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	44 #include <dcmtk/dcmdata/dcdeftag.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	45 #include <dcmtk/dcmdata/dcfilefo.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	46 #include <dcmtk/dcmdata/dcistrmb.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	47 #include <dcmtk/dcmnet/assoc.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	48 #include <dcmtk/dcmnet/dimse.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	49 #include <dcmtk/dcmnet/diutil.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	50 #include <dcmtk/ofstd/ofstring.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	51
3962 d30eb4ae5bb6 trying a fix for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3959 diff changeset	52 #include <sstream> // For std::stringstream
d30eb4ae5bb6 trying a fix for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3959 diff changeset	53
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	54 namespace Orthanc
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	55 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	56 namespace
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	57 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	58 // Anonymous namespace to avoid clashes between compilation modules
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	59
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	60 static void GetSubOpProgressCallback(
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	61 void * /* callbackData == pointer to the "OrthancGetRequestHandler" object */,
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	62 T_DIMSE_StoreProgress *progress,
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	63 T_DIMSE_C_StoreRQ * /req/)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	64 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	65 // SBL - no logging to be done here.
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	66 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	67 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	68
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	69 OrthancGetRequestHandler::Status
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	70 OrthancGetRequestHandler::DoNext(T_ASC_Association* assoc)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	71 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	72 if (position_ >= instances_.size())
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	73 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	74 return Status_Failure;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	75 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	76
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	77 const std::string& id = instances_[position_++];
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	78
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	79 std::string dicom;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	80 context_.ReadDicom(dicom, id);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	81
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	82 if (dicom.empty())
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	83 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	84 return Status_Failure;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	85 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	86
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	87 std::unique_ptr<DcmFileFormat> parsed(
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	88 FromDcmtkBridge::LoadFromMemoryBuffer(dicom.c_str(), dicom.size()));
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	89
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	90 if (parsed.get() == NULL \|\|
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	91 parsed->getDataset() == NULL)
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	92 {
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	93 throw OrthancException(ErrorCode_InternalError);
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	94 }
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	95
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	96 DcmDataset& dataset = *parsed->getDataset();
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	97
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	98 OFString a, b;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	99 if (!dataset.findAndGetOFString(DCM_SOPClassUID, a).good() \|\|
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	100 !dataset.findAndGetOFString(DCM_SOPInstanceUID, b).good())
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	101 {
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	102 throw OrthancException(ErrorCode_NoSopClassOrInstance,
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	103 "Unable to determine the SOP class/instance for C-STORE with AET " +
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	104 originatorAet_);
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	105 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	106
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	107 std::string sopClassUid(a.c_str());
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	108 std::string sopInstanceUid(b.c_str());
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	109
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	110 Status status = PerformGetSubOp(assoc, sopClassUid, sopInstanceUid, parsed.release());
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	111
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	112 if (getCancelled_)
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	113 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	114 LOG(INFO) << "C-GET SCP: Received C-Cancel RQ";
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	115 return Status_Failure;
c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	116 }
c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	117 else
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	118 {
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	119 return status;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	120 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	121 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	122
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	123
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	124 void OrthancGetRequestHandler::AddFailedUIDInstance(const std::string& sopInstance)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	125 {
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	126 if (failedUIDs_.empty())
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	127 {
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	128 failedUIDs_ = sopInstance;
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	129 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	130 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	131 {
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	132 failedUIDs_ += "\\" + sopInstance;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	133 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	134 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	135
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	136
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	137 static bool SelectPresentationContext(T_ASC_PresentationContextID& selectedPresentationId,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	138 DicomTransferSyntax& selectedSyntax,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	139 T_ASC_Association* assoc,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	140 const std::string& sopClassUid,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	141 DicomTransferSyntax sourceSyntax,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	142 bool allowTranscoding)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	143 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	144 typedef std::map<DicomTransferSyntax, T_ASC_PresentationContextID> Accepted;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	145
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	146 Accepted accepted;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	147
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	148 /**
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	149 * 1. Inspect and index all the accepted transfer syntaxes. This
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	150 * is similar to the code from "DicomAssociation::Open()".
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	151 **/
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	152
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	153 LST_HEAD **l = &assoc->params->DULparams.acceptedPresentationContext;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	154 if (*l != NULL)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	155 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	156 DUL_PRESENTATIONCONTEXT* pc = (DUL_PRESENTATIONCONTEXT*) LST_Head(l);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	157 LST_Position(l, (LST_NODE*)pc);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	158 while (pc)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	159 {
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	160 DicomTransferSyntax transferSyntax;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	161 if (pc->result == ASC_P_ACCEPTANCE &&
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	162 LookupTransferSyntax(transferSyntax, pc->acceptedTransferSyntax))
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	163 {
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	164 VLOG(0) << "C-GET SCP accepted: SOP class " << sopClassUid
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	165 << " with transfer syntax " << GetTransferSyntaxUid(transferSyntax);
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	166 if (std::string(pc->abstractSyntax) == sopClassUid)
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	167 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	168 accepted[transferSyntax] = pc->presentationContextID;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	169 }
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	170 }
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	171 else
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	172 {
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	173 LOG(WARNING) << "C-GET: Unknown transfer syntax received: "
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	174 << pc->acceptedTransferSyntax;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	175 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	176
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	177 pc = (DUL_PRESENTATIONCONTEXT*) LST_Next(l);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	178 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	179 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	180
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	181
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	182 /**
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	183 * 2. Select the preferred transfer syntaxes, which corresponds to
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	184 * the source transfer syntax, plus all the uncompressed transfer
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	185 * syntaxes if transcoding is enabled.
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	186 **/
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	187
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	188 std::list<DicomTransferSyntax> preferred;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	189 preferred.push_back(sourceSyntax);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	190
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	191 if (allowTranscoding)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	192 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	193 if (sourceSyntax != DicomTransferSyntax_LittleEndianImplicit)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	194 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	195 // Default Transfer Syntax for DICOM
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	196 preferred.push_back(DicomTransferSyntax_LittleEndianImplicit);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	197 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	198
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	199 if (sourceSyntax != DicomTransferSyntax_LittleEndianExplicit)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	200 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	201 preferred.push_back(DicomTransferSyntax_LittleEndianExplicit);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	202 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	203
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	204 if (sourceSyntax != DicomTransferSyntax_BigEndianExplicit)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	205 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	206 // Retired
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	207 preferred.push_back(DicomTransferSyntax_BigEndianExplicit);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	208 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	209 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	210
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	211
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	212 /**
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	213 * 3. Lookup whether one of the preferred transfer syntaxes was
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	214 * accepted.
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	215 **/
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	216
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	217 for (std::list<DicomTransferSyntax>::const_iterator
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	218 it = preferred.begin(); it != preferred.end(); ++it)
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	219 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	220 Accepted::const_iterator found = accepted.find(*it);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	221 if (found != accepted.end())
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	222 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	223 selectedPresentationId = found->second;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	224 selectedSyntax = *it;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	225 return true;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	226 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	227 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	228
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	229 // No preferred syntax was accepted
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	230 return false;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	231 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	232
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	233
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	234 OrthancGetRequestHandler::Status
c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	235 OrthancGetRequestHandler::PerformGetSubOp(T_ASC_Association* assoc,
c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	236 const std::string& sopClassUid,
c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	237 const std::string& sopInstanceUid,
c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	238 DcmFileFormat* dicomRaw)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	239 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	240 assert(dicomRaw != NULL);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	241 std::unique_ptr<DcmFileFormat> dicom(dicomRaw);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	242
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	243 DicomTransferSyntax sourceSyntax;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	244 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(sourceSyntax, *dicom))
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	245 {
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	246 nFailed_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	247 AddFailedUIDInstance(sopInstanceUid);
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	248 LOG(ERROR) << "C-GET SCP: Unknown transfer syntax: ("
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	249 << dcmSOPClassUIDToModality(sopClassUid.c_str(), "OT") << ") " << sopClassUid;
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	250 return Status_Failure;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	251 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	252
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	253 bool allowTranscoding = (context_.IsTranscodeDicomProtocol() &&
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	254 remote_.IsTranscodingAllowed());
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	255
3972 7f8b30416d50 minor clarification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3970 diff changeset	256 T_ASC_PresentationContextID presId = 0; // Unnecessary initialization, makes code clearer
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	257 DicomTransferSyntax selectedSyntax;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	258 if (!SelectPresentationContext(presId, selectedSyntax, assoc, sopClassUid,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	259 sourceSyntax, allowTranscoding) \|\|
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	260 presId == 0)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	261 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	262 nFailed_++;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	263 AddFailedUIDInstance(sopInstanceUid);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	264 LOG(ERROR) << "C-GET SCP: storeSCU: No presentation context for: ("
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	265 << dcmSOPClassUIDToModality(sopClassUid.c_str(), "OT") << ") " << sopClassUid;
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	266 return Status_Failure;
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	267 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	268 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	269 {
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	270 LOG(INFO) << "C-GET SCP selected transfer syntax " << GetTransferSyntaxUid(selectedSyntax)
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	271 << ", for source instance with SOP class " << sopClassUid
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	272 << " and transfer syntax " << GetTransferSyntaxUid(sourceSyntax);
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	273
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	274 // make sure that we can send images in this presentation context
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	275 T_ASC_PresentationContext pc;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	276 ASC_findAcceptedPresentationContext(assoc->params, presId, &pc);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	277 // the acceptedRole is the association requestor role
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	278
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	279 if (pc.acceptedRole != ASC_SC_ROLE_DEFAULT && // "DEFAULT" is necessary for GinkgoCADx
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	280 pc.acceptedRole != ASC_SC_ROLE_SCP &&
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	281 pc.acceptedRole != ASC_SC_ROLE_SCUSCP)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	282 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	283 // the role is not appropriate
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	284 nFailed_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	285 AddFailedUIDInstance(sopInstanceUid);
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	286 LOG(ERROR) << "C-GET SCP: storeSCU: [No presentation context with requestor SCP role for: ("
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	287 << dcmSOPClassUIDToModality(sopClassUid.c_str(), "OT") << ") " << sopClassUid;
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	288 return Status_Failure;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	289 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	290 }
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	291
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	292 const DIC_US msgId = assoc->nextMsgID++;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	293
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	294 T_DIMSE_C_StoreRQ req;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	295 memset(&req, 0, sizeof(req));
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	296 req.MessageID = msgId;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	297 strncpy(req.AffectedSOPClassUID, sopClassUid.c_str(), DIC_UI_LEN);
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	298 strncpy(req.AffectedSOPInstanceUID, sopInstanceUid.c_str(), DIC_UI_LEN);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	299 req.DataSetType = DIMSE_DATASET_PRESENT;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	300 req.Priority = DIMSE_PRIORITY_MEDIUM;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	301 req.opts = 0;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	302
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	303 T_DIMSE_C_StoreRSP rsp;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	304 memset(&rsp, 0, sizeof(rsp));
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	305
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	306 LOG(INFO) << "Store SCU RQ: MsgID " << msgId << ", ("
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	307 << dcmSOPClassUIDToModality(sopClassUid.c_str(), "OT") << ")";
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	308
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	309 T_DIMSE_DetectedCancelParameters cancelParameters;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	310 memset(&cancelParameters, 0, sizeof(cancelParameters));
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	311
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	312 std::unique_ptr<DcmDataset> stDetail;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	313
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	314 OFCondition cond;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	315
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	316 if (sourceSyntax == selectedSyntax)
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	317 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	318 // No transcoding is required
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	319 DcmDataset *stDetailTmp = NULL;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	320 cond = DIMSE_storeUser(
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	321 assoc, presId, &req, NULL /* imageFileName */, dicom->getDataset(),
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	322 GetSubOpProgressCallback, this /* callbackData */,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	323 (timeout_ > 0 ? DIMSE_NONBLOCKING : DIMSE_BLOCKING), timeout_,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	324 &rsp, &stDetailTmp, &cancelParameters);
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	325 stDetail.reset(stDetailTmp);
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	326 }
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	327 else
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	328 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	329 // Transcoding to the selected uncompressed transfer syntax
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	330 IDicomTranscoder::DicomImage source, transcoded;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	331 source.AcquireParsed(dicom.release());
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	332
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	333 std::set<DicomTransferSyntax> ts;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	334 ts.insert(selectedSyntax);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	335
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	336 if (context_.Transcode(transcoded, source, ts, true))
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	337 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	338 // Transcoding has succeeded
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	339 DcmDataset *stDetailTmp = NULL;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	340 cond = DIMSE_storeUser(
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	341 assoc, presId, &req, NULL /* imageFileName */,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	342 transcoded.GetParsed().getDataset(),
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	343 GetSubOpProgressCallback, this /* callbackData */,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	344 (timeout_ > 0 ? DIMSE_NONBLOCKING : DIMSE_BLOCKING), timeout_,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	345 &rsp, &stDetailTmp, &cancelParameters);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	346 stDetail.reset(stDetailTmp);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	347 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	348 else
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	349 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	350 // Cannot transcode
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	351 nFailed_++;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	352 AddFailedUIDInstance(sopInstanceUid);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	353 LOG(ERROR) << "C-GET SCP: Cannot transcode " << sopClassUid
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	354 << " from transfer syntax " << GetTransferSyntaxUid(sourceSyntax)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	355 << " to " << GetTransferSyntaxUid(selectedSyntax);
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	356 return Status_Failure;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	357 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	358 }
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	359
c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	360 Status status;
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	361 if (cond.good())
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	362 {
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	363 if (cancelParameters.cancelEncountered)
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	364 {
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	365 if (origPresId_ == cancelParameters.presId &&
67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	366 origMsgId_ == cancelParameters.req.MessageIDBeingRespondedTo)
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	367 {
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	368 getCancelled_ = true;
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	369 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	370 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	371 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	372 LOG(ERROR) << "C-GET SCP: Unexpected C-Cancel-RQ encountered: pid=" << (int)cancelParameters.presId
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	373 << ", mid=" << (int)cancelParameters.req.MessageIDBeingRespondedTo;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	374 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	375 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	376
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	377 if (rsp.DimseStatus == STATUS_Success)
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	378 {
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	379 // everything ok
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	380 nCompleted_++;
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	381 status = Status_Success;
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	382 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	383 else if ((rsp.DimseStatus & 0xf000) == 0xb000)
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	384 {
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	385 // a warning status message
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	386 warningCount_++;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	387 LOG(ERROR) << "C-GET SCP: Store Warning: Response Status: "
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	388 << DU_cstoreStatusString(rsp.DimseStatus);
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	389 status = Status_Warning;
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	390 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	391 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	392 {
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	393 nFailed_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	394 AddFailedUIDInstance(sopInstanceUid);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	395 // print a status message
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	396 LOG(ERROR) << "C-GET SCP: Store Failed: Response Status: "
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	397 << DU_cstoreStatusString(rsp.DimseStatus);
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	398 status = Status_Failure;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	399 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	400 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	401 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	402 {
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	403 nFailed_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	404 AddFailedUIDInstance(sopInstanceUid);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	405 OFString temp_str;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	406 LOG(ERROR) << "C-GET SCP: storeSCU: Store Request Failed: " << DimseCondition::dump(temp_str, cond);
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	407 status = Status_Failure;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	408 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	409
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	410 if (stDetail.get() != NULL)
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	411 {
3963 3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	412 // It is impossible to directly use the "<<" stream construct
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	413 // with "DcmObject::PrintHelper" using MSVC2008
3962 d30eb4ae5bb6 trying a fix for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3959 diff changeset	414 std::stringstream s;
3963 3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	415 DcmObject::PrintHelper obj(*stDetail);
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	416 obj.dcmobj_.print(s);
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	417
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	418 LOG(INFO) << " Status Detail: " << s.str();
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	419 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	420
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	421 return status;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	422 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	423
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	424 bool OrthancGetRequestHandler::LookupIdentifiers(std::list<std::string>& publicIds,
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	425 ResourceType level,
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	426 const DicomMap& input) const
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	427 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	428 DicomTag tag(0, 0); // Dummy initialization
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	429
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	430 switch (level)
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	431 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	432 case ResourceType_Patient:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	433 tag = DICOM_TAG_PATIENT_ID;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	434 break;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	435
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	436 case ResourceType_Study:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	437 tag = (input.HasTag(DICOM_TAG_ACCESSION_NUMBER) ?
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	438 DICOM_TAG_ACCESSION_NUMBER : DICOM_TAG_STUDY_INSTANCE_UID);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	439 break;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	440
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	441 case ResourceType_Series:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	442 tag = DICOM_TAG_SERIES_INSTANCE_UID;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	443 break;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	444
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	445 case ResourceType_Instance:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	446 tag = DICOM_TAG_SOP_INSTANCE_UID;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	447 break;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	448
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	449 default:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	450 throw OrthancException(ErrorCode_ParameterOutOfRange);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	451 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	452
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	453 if (!input.HasTag(tag))
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	454 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	455 return false;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	456 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	457
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	458 const DicomValue& value = input.GetValue(tag);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	459 if (value.IsNull() \|\|
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	460 value.IsBinary())
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	461 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	462 return false;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	463 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	464 else
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	465 {
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	466 std::vector<std::string> tokens;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	467 Toolbox::TokenizeString(tokens, value.GetContent(), '\\');
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	468
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	469 for (size_t i = 0; i < tokens.size(); i++)
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	470 {
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	471 std::vector<std::string> tmp;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	472 context_.GetIndex().LookupIdentifierExact(tmp, level, tag, tokens[i]);
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	473
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	474 if (tmp.empty())
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	475 {
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	476 LOG(ERROR) << "C-GET: Cannot locate resource \"" << tokens[i]
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	477 << "\" at the " << EnumerationToString(level) << " level";
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	478 return false;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	479 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	480 else
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	481 {
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	482 for (size_t j = 0; j < tmp.size(); j++)
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	483 {
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	484 publicIds.push_back(tmp[j]);
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	485 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	486 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	487 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	488
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	489 return true;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	490 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	491 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	492
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	493
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	494 OrthancGetRequestHandler::OrthancGetRequestHandler(ServerContext& context) :
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	495 context_(context),
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	496 getCancelled_(false)
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	497 {
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	498 position_ = 0;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	499 nRemaining_ = 0;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	500 nCompleted_ = 0;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	501 warningCount_ = 0;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	502 nFailed_ = 0;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	503 timeout_ = 0;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	504 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	505
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	506
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	507 bool OrthancGetRequestHandler::Handle(const DicomMap& input,
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	508 const std::string& originatorIp,
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	509 const std::string& originatorAet,
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	510 const std::string& calledAet,
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	511 uint32_t timeout)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	512 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	513 MetricsRegistry::Timer timer(context_.GetMetricsRegistry(), "orthanc_get_scp_duration_ms");
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	514
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	515 LOG(WARNING) << "C-GET-SCU request received from AET \"" << originatorAet << "\"";
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	516
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	517 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	518 DicomArray query(input);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	519 for (size_t i = 0; i < query.GetSize(); i++)
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	520 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	521 if (!query.GetElement(i).GetValue().IsNull())
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	522 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	523 LOG(INFO) << " " << query.GetElement(i).GetTag()
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	524 << " " << FromDcmtkBridge::GetTagName(query.GetElement(i))
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	525 << " = " << query.GetElement(i).GetValue().GetContent();
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	526 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	527 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	528 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	529
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	530 /**
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	531 * Retrieve the query level.
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	532 **/
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	533
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	534 const DicomValue* levelTmp = input.TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	535
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	536 assert(levelTmp != NULL);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	537 ResourceType level = StringToResourceType(levelTmp->GetContent().c_str());
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	538
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	539
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	540 /**
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	541 * Lookup for the resource to be sent.
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	542 **/
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	543
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	544 std::list<std::string> publicIds;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	545
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	546 if (!LookupIdentifiers(publicIds, level, input))
67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	547 {
67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	548 LOG(ERROR) << "Cannot determine what resources are requested by C-GET";
67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	549 return false;
67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	550 }
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	551
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	552 localAet_ = context_.GetDefaultLocalApplicationEntityTitle();
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	553 position_ = 0;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	554 originatorAet_ = originatorAet;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	555
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	556 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	557 OrthancConfiguration::ReaderLock lock;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	558 remote_ = lock.GetConfiguration().GetModalityUsingAet(originatorAet);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	559 }
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	560
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	561 for (std::list<std::string>::const_iterator
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	562 resource = publicIds.begin(); resource != publicIds.end(); ++resource)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	563 {
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	564 LOG(INFO) << "C-GET: Sending resource " << *resource
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	565 << " to modality \"" << originatorAet << "\"";
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	566
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	567 std::list<std::string> tmp;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	568 context_.GetIndex().GetChildInstances(tmp, *resource);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	569
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	570 instances_.reserve(tmp.size());
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	571 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); ++it)
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	572 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	573 instances_.push_back(*it);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	574 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	575 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	576
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	577 failedUIDs_.clear();
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	578 getCancelled_ = false;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	579
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	580 nRemaining_ = GetSubOperationCount();
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	581 nCompleted_ = 0;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	582 nFailed_ = 0;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	583 warningCount_ = 0;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	584 timeout_ = timeout;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	585
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	586 return true;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	587 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	588 };

Mercurial > hg > orthanc

annotate OrthancServer/Sources/OrthancGetRequestHandler.cpp @ 4257:c046d559edb3