orthanc: OrthancServer/Sources/OrthancGetRequestHandler.cpp annotate

annotate OrthancServer/Sources/OrthancGetRequestHandler.cpp @ 4372:bda867e036f3

tagging Orthanc framework 4a3ba4bf4ba7 for PostgreSQL 3.3

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 14 Dec 2020 17:33:17 +0100
parents	91554aecff9a
children	208029732d51

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 {
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	56 static void ProgressCallback(void *callbackData,
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	57 T_DIMSE_StoreProgress *progress,
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	58 T_DIMSE_C_StoreRQ *req)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	59 {
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	60 if (req != NULL &&
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	61 progress->state == DIMSE_StoreBegin)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	62 {
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	63 OFString str;
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	64 CLOG(TRACE, DICOM) << "Sending Store Request following a C-GET:" << std::endl
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	65 << DIMSE_dumpMessage(str, *req, DIMSE_OUTGOING);
3818 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
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	69
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	70 bool 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 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	74 throw OrthancException(ErrorCode_ParameterOutOfRange);
3818 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 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	84 throw OrthancException(ErrorCode_BadFileFormat);
3818 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
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	110 return PerformGetSubOp(assoc, sopClassUid, sopInstanceUid, parsed.release());
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	111 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	112
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	113
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	114 void OrthancGetRequestHandler::AddFailedUIDInstance(const std::string& sopInstance)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	115 {
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	116 if (failedUIDs_.empty())
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	117 {
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	118 failedUIDs_ = sopInstance;
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	119 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	120 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	121 {
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	122 failedUIDs_ += "\\" + sopInstance;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	123 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	124 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	125
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	126
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	127 static bool SelectPresentationContext(T_ASC_PresentationContextID& selectedPresentationId,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	128 DicomTransferSyntax& selectedSyntax,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	129 T_ASC_Association* assoc,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	130 const std::string& sopClassUid,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	131 DicomTransferSyntax sourceSyntax,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	132 bool allowTranscoding)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	133 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	134 typedef std::map<DicomTransferSyntax, T_ASC_PresentationContextID> Accepted;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	135
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	136 Accepted accepted;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	137
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	138 /**
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	139 * 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	140 * is similar to the code from "DicomAssociation::Open()".
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	141 **/
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	142
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	143 LST_HEAD **l = &assoc->params->DULparams.acceptedPresentationContext;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	144 if (*l != NULL)
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 DUL_PRESENTATIONCONTEXT* pc = (DUL_PRESENTATIONCONTEXT*) LST_Head(l);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	147 LST_Position(l, (LST_NODE*)pc);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	148 while (pc)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	149 {
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	150 DicomTransferSyntax transferSyntax;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	151 if (pc->result == ASC_P_ACCEPTANCE &&
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	152 LookupTransferSyntax(transferSyntax, pc->acceptedTransferSyntax))
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	153 {
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	154 /*CLOG(TRACE, DICOM) << "C-GET SCP accepted: SOP class " << pc->abstractSyntax
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	155 << " with transfer syntax " << GetTransferSyntaxUid(transferSyntax);*/
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	156 if (std::string(pc->abstractSyntax) == sopClassUid)
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	157 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	158 accepted[transferSyntax] = pc->presentationContextID;
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 }
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	161 else
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	162 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	163 CLOG(WARNING, DICOM) << "C-GET: Unknown transfer syntax received: "
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	164 << pc->acceptedTransferSyntax;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	165 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	166
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	167 pc = (DUL_PRESENTATIONCONTEXT*) LST_Next(l);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	168 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	169 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	170
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	171
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	172 /**
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	173 * 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	174 * 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	175 * syntaxes if transcoding is enabled.
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
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	178 std::list<DicomTransferSyntax> preferred;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	179 preferred.push_back(sourceSyntax);
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 if (allowTranscoding)
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 if (sourceSyntax != DicomTransferSyntax_LittleEndianImplicit)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	184 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	185 // Default Transfer Syntax for DICOM
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	186 preferred.push_back(DicomTransferSyntax_LittleEndianImplicit);
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
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	189 if (sourceSyntax != DicomTransferSyntax_LittleEndianExplicit)
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 preferred.push_back(DicomTransferSyntax_LittleEndianExplicit);
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
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	194 if (sourceSyntax != DicomTransferSyntax_BigEndianExplicit)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	195 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	196 // Retired
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	197 preferred.push_back(DicomTransferSyntax_BigEndianExplicit);
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 }
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
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 * 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	204 * accepted.
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
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	207 for (std::list<DicomTransferSyntax>::const_iterator
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	208 it = preferred.begin(); it != preferred.end(); ++it)
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	209 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	210 Accepted::const_iterator found = accepted.find(*it);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	211 if (found != accepted.end())
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 selectedPresentationId = found->second;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	214 selectedSyntax = *it;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	215 return true;
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 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	218
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	219 // No preferred syntax was accepted
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	220 return false;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	221 }
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
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	224 bool OrthancGetRequestHandler::PerformGetSubOp(T_ASC_Association* assoc,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	225 const std::string& sopClassUid,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	226 const std::string& sopInstanceUid,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	227 DcmFileFormat* dicomRaw)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	228 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	229 assert(dicomRaw != NULL);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	230 std::unique_ptr<DcmFileFormat> dicom(dicomRaw);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	231
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	232 DicomTransferSyntax sourceSyntax;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	233 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(sourceSyntax, *dicom))
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	234 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	235 failedCount_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	236 AddFailedUIDInstance(sopInstanceUid);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	237 throw OrthancException(ErrorCode_NetworkProtocol,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	238 "C-GET SCP: Unknown transfer syntax: (" +
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	239 std::string(dcmSOPClassUIDToModality(sopClassUid.c_str(), "OT")) +
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	240 ") " + sopClassUid);
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	241 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	242
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	243 bool allowTranscoding = (context_.IsTranscodeDicomProtocol() &&
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	244 remote_.IsTranscodingAllowed());
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	245
3972 7f8b30416d50 minor clarification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3970 diff changeset	246 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	247 DicomTransferSyntax selectedSyntax;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	248 if (!SelectPresentationContext(presId, selectedSyntax, assoc, sopClassUid,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	249 sourceSyntax, allowTranscoding) \|\|
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	250 presId == 0)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	251 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	252 failedCount_++;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	253 AddFailedUIDInstance(sopInstanceUid);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	254 throw OrthancException(ErrorCode_NetworkProtocol,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	255 "C-GET SCP: storeSCU: No presentation context for: (" +
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	256 std::string(dcmSOPClassUIDToModality(sopClassUid.c_str(), "OT")) +
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	257 ") " + sopClassUid);
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	258 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	259 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	260 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	261 CLOG(INFO, DICOM) << "C-GET SCP selected transfer syntax " << GetTransferSyntaxUid(selectedSyntax)
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	262 << ", for source instance with SOP class " << sopClassUid
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	263 << " and transfer syntax " << GetTransferSyntaxUid(sourceSyntax);
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	264
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	265 // 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	266 T_ASC_PresentationContext pc;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	267 ASC_findAcceptedPresentationContext(assoc->params, presId, &pc);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	268 // the acceptedRole is the association requestor role
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	269
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	270 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	271 pc.acceptedRole != ASC_SC_ROLE_SCP &&
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	272 pc.acceptedRole != ASC_SC_ROLE_SCUSCP)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	273 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	274 // the role is not appropriate
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	275 failedCount_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	276 AddFailedUIDInstance(sopInstanceUid);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	277 throw OrthancException(ErrorCode_NetworkProtocol,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	278 "C-GET SCP: storeSCU: [No presentation context with requestor SCP role for: (" +
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	279 std::string(dcmSOPClassUIDToModality(sopClassUid.c_str(), "OT")) +
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	280 ") " + sopClassUid);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	281 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	282 }
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	283
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	284 const DIC_US msgId = assoc->nextMsgID++;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	285
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	286 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	287 memset(&req, 0, sizeof(req));
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	288 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	289 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	290 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	291 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	292 req.Priority = DIMSE_PRIORITY_MEDIUM;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	293 req.opts = 0;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	294
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	295 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	296 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	297
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	298 CLOG(INFO, DICOM) << "Store SCU RQ: MsgID " << msgId << ", ("
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	299 << dcmSOPClassUIDToModality(sopClassUid.c_str(), "OT") << ")";
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	300
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	301 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	302 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	303
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	304 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	305
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	306 OFCondition cond;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	307
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	308 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	309 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	310 // 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	311 DcmDataset *stDetailTmp = NULL;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	312 cond = DIMSE_storeUser(
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	313 assoc, presId, &req, NULL /* imageFileName */, dicom->getDataset(),
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	314 ProgressCallback, NULL /* callbackData */,
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	315 (timeout_ > 0 ? DIMSE_NONBLOCKING : DIMSE_BLOCKING), timeout_,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	316 &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	317 stDetail.reset(stDetailTmp);
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	318 }
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	319 else
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	320 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	321 // Transcoding to the selected uncompressed transfer syntax
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	322 IDicomTranscoder::DicomImage source, transcoded;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	323 source.AcquireParsed(dicom.release());
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	324
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	325 std::set<DicomTransferSyntax> ts;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	326 ts.insert(selectedSyntax);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	327
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	328 if (context_.Transcode(transcoded, source, ts, true))
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	329 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	330 // Transcoding has succeeded
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	331 DcmDataset *stDetailTmp = NULL;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	332 cond = DIMSE_storeUser(
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	333 assoc, presId, &req, NULL /* imageFileName */,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	334 transcoded.GetParsed().getDataset(),
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	335 ProgressCallback, NULL /* callbackData */,
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	336 (timeout_ > 0 ? DIMSE_NONBLOCKING : DIMSE_BLOCKING), timeout_,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	337 &rsp, &stDetailTmp, &cancelParameters);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	338 stDetail.reset(stDetailTmp);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	339 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	340 else
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	341 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	342 // Cannot transcode
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	343 failedCount_++;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	344 AddFailedUIDInstance(sopInstanceUid);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	345 throw OrthancException(ErrorCode_NotImplemented,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	346 "C-GET SCP: Cannot transcode " + sopClassUid +
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	347 " from transfer syntax " + GetTransferSyntaxUid(sourceSyntax) +
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	348 " to " + GetTransferSyntaxUid(selectedSyntax));
3959 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 }
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	351
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	352 bool isContinue;
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	353
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	354 if (cond.good())
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	355 {
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	356 {
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	357 OFString str;
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	358 CLOG(TRACE, DICOM) << "Received Store Response following a C-GET:" << std::endl
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	359 << DIMSE_dumpMessage(str, rsp, DIMSE_INCOMING);
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	360 }
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	361
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	362 if (cancelParameters.cancelEncountered)
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	363 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	364 CLOG(INFO, DICOM) << "C-GET SCP: Received C-Cancel RQ";
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	365 isContinue = false;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	366 }
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	367 else if (rsp.DimseStatus == STATUS_Success)
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	368 {
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	369 // everything ok
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	370 completedCount_++;
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	371 isContinue = true;
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	372 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	373 else if ((rsp.DimseStatus & 0xf000) == 0xb000)
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	374 {
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	375 // a warning status message
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	376 warningCount_++;
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	377 CLOG(ERROR, DICOM) << "C-GET SCP: Store Warning: Response Status: "
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	378 << DU_cstoreStatusString(rsp.DimseStatus);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	379 isContinue = true;
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	380 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	381 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	382 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	383 failedCount_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	384 AddFailedUIDInstance(sopInstanceUid);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	385 // print a status message
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	386 CLOG(ERROR, DICOM) << "C-GET SCP: Store Failed: Response Status: "
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	387 << DU_cstoreStatusString(rsp.DimseStatus);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	388 isContinue = true;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	389 }
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 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	393 failedCount_++;
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 OFString temp_str;
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	396 CLOG(ERROR, DICOM) << "C-GET SCP: storeSCU: Store Request Failed: "
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	397 << DimseCondition::dump(temp_str, cond);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	398 isContinue = true;
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
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	401 if (stDetail.get() != NULL)
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	402 {
4288 5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4287 diff changeset	403 std::stringstream s; // DcmObject::PrintHelper cannot be used with VS2008
5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4287 diff changeset	404 stDetail->print(s);
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	405 CLOG(INFO, DICOM) << " Status Detail: " << s.str();
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	406 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	407
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	408 return isContinue;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	409 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	410
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	411 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	412 ResourceType level,
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	413 const DicomMap& input) const
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	414 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	415 DicomTag tag(0, 0); // Dummy initialization
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	416
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	417 switch (level)
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	418 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	419 case ResourceType_Patient:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	420 tag = DICOM_TAG_PATIENT_ID;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	421 break;
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 case ResourceType_Study:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	424 tag = (input.HasTag(DICOM_TAG_ACCESSION_NUMBER) ?
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	425 DICOM_TAG_ACCESSION_NUMBER : DICOM_TAG_STUDY_INSTANCE_UID);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	426 break;
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 case ResourceType_Series:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	429 tag = DICOM_TAG_SERIES_INSTANCE_UID;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	430 break;
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_Instance:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	433 tag = DICOM_TAG_SOP_INSTANCE_UID;
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 default:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	437 throw OrthancException(ErrorCode_ParameterOutOfRange);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	438 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	439
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	440 if (!input.HasTag(tag))
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	441 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	442 return false;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	443 }
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 const DicomValue& value = input.GetValue(tag);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	446 if (value.IsNull() \|\|
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	447 value.IsBinary())
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 return false;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	450 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	451 else
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	452 {
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	453 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	454 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	455
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	456 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	457 {
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	458 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	459 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	460
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	461 if (tmp.empty())
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	462 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	463 CLOG(ERROR, DICOM) << "C-GET: Cannot locate resource \"" << tokens[i]
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	464 << "\" at the " << EnumerationToString(level) << " level";
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	465 return false;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	466 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	467 else
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	468 {
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	469 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	470 {
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	471 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	472 }
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 }
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 return true;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	477 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	478 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	479
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	480
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	481 OrthancGetRequestHandler::OrthancGetRequestHandler(ServerContext& context) :
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	482 context_(context)
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	483 {
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	484 position_ = 0;
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	485 completedCount_ = 0;
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	486 warningCount_ = 0;
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	487 failedCount_ = 0;
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	488 timeout_ = 0;
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	489 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	490
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	491
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	492 bool OrthancGetRequestHandler::Handle(const DicomMap& input,
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	493 const std::string& originatorIp,
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	494 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	495 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	496 uint32_t timeout)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	497 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	498 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	499
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	500 CLOG(WARNING, DICOM) << "C-GET-SCU request received from AET \"" << originatorAet << "\"";
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	501
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	502 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	503 DicomArray query(input);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	504 for (size_t i = 0; i < query.GetSize(); i++)
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	505 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	506 if (!query.GetElement(i).GetValue().IsNull())
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	507 {
4313 91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	508 CLOG(INFO, DICOM) << " (" << query.GetElement(i).GetTag().Format()
91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	509 << ") " << FromDcmtkBridge::GetTagName(query.GetElement(i))
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	510 << " = " << query.GetElement(i).GetValue().GetContent();
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	511 }
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 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	514
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	515 /**
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	516 * Retrieve the query level.
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
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	519 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	520
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	521 assert(levelTmp != NULL);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	522 ResourceType level = StringToResourceType(levelTmp->GetContent().c_str());
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	523
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	524
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	525 /**
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	526 * Lookup for the resource to be sent.
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
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	529 std::list<std::string> publicIds;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	530
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	531 if (!LookupIdentifiers(publicIds, level, input))
67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	532 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	533 CLOG(ERROR, DICOM) << "Cannot determine what resources are requested by C-GET";
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	534 return false;
67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	535 }
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	536
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	537 localAet_ = context_.GetDefaultLocalApplicationEntityTitle();
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	538 position_ = 0;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	539 originatorAet_ = originatorAet;
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 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	542 OrthancConfiguration::ReaderLock lock;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	543 remote_ = lock.GetConfiguration().GetModalityUsingAet(originatorAet);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	544 }
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	545
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	546 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	547 resource = publicIds.begin(); resource != publicIds.end(); ++resource)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	548 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	549 CLOG(INFO, DICOM) << "C-GET: Sending resource " << *resource
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	550 << " to modality \"" << originatorAet << "\"";
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	551
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	552 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	553 context_.GetIndex().GetChildInstances(tmp, *resource);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	554
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	555 instances_.reserve(tmp.size());
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	556 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	557 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	558 instances_.push_back(*it);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	559 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	560 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	561
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	562 failedUIDs_.clear();
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	563
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	564 completedCount_ = 0;
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	565 failedCount_ = 0;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	566 warningCount_ = 0;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	567 timeout_ = timeout;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	568
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	569 return true;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	570 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	571 };

Mercurial > hg > orthanc

annotate OrthancServer/Sources/OrthancGetRequestHandler.cpp @ 4372:bda867e036f3