orthanc: OrthancServer/Sources/OrthancGetRequestHandler.cpp annotate

annotate OrthancServer/Sources/OrthancGetRequestHandler.cpp @ 5363:3c8286e5d07b multiple-jpeg-decoders

wip: try to add a jpeg decoder without colorspace conversion: not working now

author	Alain Mazy <am@osimis.io>
date	Tue, 11 Jul 2023 10:25:58 +0200
parents	0ea402b4d901
children

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
5185 0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4892 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4892 diff changeset	6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	7 *
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	8 * 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	9 * 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	10 * 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	11 * License, or (at your option) any later version.
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	12 *
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	13 * 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	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	15 * 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	16 * General Public License for more details.
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	17 *
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	18 * 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	19 * 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	20 **/
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	21
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	22 #include "PrecompiledHeadersServer.h"
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	23 #include "OrthancGetRequestHandler.h"
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	24
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	25 #include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	26 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	27 #include "../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	28 #include "../../OrthancFramework/Sources/MetricsRegistry.h"
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	29 #include "OrthancConfiguration.h"
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	30 #include "ServerContext.h"
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	31 #include "ServerJobs/DicomModalityStoreJob.h"
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	32
3963 3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	33 #include <dcmtk/dcmdata/dcdeftag.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	34 #include <dcmtk/dcmdata/dcfilefo.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	35 #include <dcmtk/dcmdata/dcistrmb.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	36 #include <dcmtk/dcmnet/assoc.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	37 #include <dcmtk/dcmnet/dimse.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	38 #include <dcmtk/dcmnet/diutil.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	39 #include <dcmtk/ofstd/ofstring.h>
3b0c555f16a3 fix msvc2008 s.jodogne@gmail.com parents: 3962 diff changeset	40
3962 d30eb4ae5bb6 trying a fix for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3959 diff changeset	41 #include <sstream> // For std::stringstream
d30eb4ae5bb6 trying a fix for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3959 diff changeset	42
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	43 namespace Orthanc
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	44 {
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	45 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	46 T_DIMSE_StoreProgress *progress,
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	47 T_DIMSE_C_StoreRQ *req)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	48 {
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	49 if (req != NULL &&
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	50 progress->state == DIMSE_StoreBegin)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	51 {
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	52 OFString str;
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	53 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	54 << DIMSE_dumpMessage(str, *req, DIMSE_OUTGOING);
3818 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 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	57
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	58
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	59 bool OrthancGetRequestHandler::DoNext(T_ASC_Association* assoc)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	60 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	61 if (position_ >= instances_.size())
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	62 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	63 throw OrthancException(ErrorCode_ParameterOutOfRange);
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
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	66 const std::string& id = instances_[position_++];
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	67
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	68 std::string dicom;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	69 context_.ReadDicom(dicom, id);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	70
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	71 if (dicom.empty())
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	72 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	73 throw OrthancException(ErrorCode_BadFileFormat);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	74 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	75
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	76 std::unique_ptr<DcmFileFormat> parsed(
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	77 FromDcmtkBridge::LoadFromMemoryBuffer(dicom.c_str(), dicom.size()));
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	78
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	79 if (parsed.get() == NULL \|\|
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	80 parsed->getDataset() == NULL)
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	81 {
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	82 throw OrthancException(ErrorCode_InternalError);
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	83 }
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	84
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	85 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	86
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	87 OFString a, b;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	88 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	89 !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	90 {
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	91 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	92 "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	93 originatorAet_);
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	94 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	95
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	96 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	97 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	98
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	99 return PerformGetSubOp(assoc, sopClassUid, sopInstanceUid, parsed.release());
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	100 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	101
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	102
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	103 void OrthancGetRequestHandler::AddFailedUIDInstance(const std::string& sopInstance)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	104 {
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	105 if (failedUIDs_.empty())
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	106 {
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	107 failedUIDs_ = sopInstance;
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	108 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	109 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	110 {
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	111 failedUIDs_ += "\\" + sopInstance;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	112 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	113 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	114
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	115
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	116 static bool SelectPresentationContext(T_ASC_PresentationContextID& selectedPresentationId,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	117 DicomTransferSyntax& selectedSyntax,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	118 T_ASC_Association* assoc,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	119 const std::string& sopClassUid,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	120 DicomTransferSyntax sourceSyntax,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	121 bool allowTranscoding)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	122 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	123 typedef std::map<DicomTransferSyntax, T_ASC_PresentationContextID> Accepted;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	124
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	125 Accepted accepted;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	126
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	127 /**
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	128 * 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	129 * is similar to the code from "DicomAssociation::Open()".
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	130 **/
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	131
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	132 LST_HEAD **l = &assoc->params->DULparams.acceptedPresentationContext;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	133 if (*l != NULL)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	134 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	135 DUL_PRESENTATIONCONTEXT* pc = (DUL_PRESENTATIONCONTEXT*) LST_Head(l);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	136 LST_Position(l, (LST_NODE*)pc);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	137 while (pc)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	138 {
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	139 DicomTransferSyntax transferSyntax;
4669 b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	140 if (pc->result == ASC_P_ACCEPTANCE)
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	141 {
4669 b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	142 if (LookupTransferSyntax(transferSyntax, pc->acceptedTransferSyntax))
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	143 {
4669 b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	144 /*CLOG(TRACE, DICOM) << "C-GET SCP accepted: SOP class " << pc->abstractSyntax
b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	145 << " with transfer syntax " << GetTransferSyntaxUid(transferSyntax);*/
b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	146 if (std::string(pc->abstractSyntax) == sopClassUid)
b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	147 {
b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	148 accepted[transferSyntax] = pc->presentationContextID;
b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	149 }
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	150 }
4669 b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	151 else
b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	152 {
b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	153 CLOG(WARNING, DICOM) << "C-GET: Unknown transfer syntax received: "
b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	154 << pc->acceptedTransferSyntax;
b14989f9ff8b fix misleading log message about unknown transfer syntax in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4482 diff changeset	155 }
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	156 }
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 pc = (DUL_PRESENTATIONCONTEXT*) LST_Next(l);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	159 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	160 }
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	161
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	162
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	163 /**
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	164 * 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	165 * 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	166 * syntaxes if transcoding is enabled.
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
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	169 std::list<DicomTransferSyntax> preferred;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	170 preferred.push_back(sourceSyntax);
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 if (allowTranscoding)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	173 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	174 if (sourceSyntax != DicomTransferSyntax_LittleEndianImplicit)
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 // Default Transfer Syntax for DICOM
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	177 preferred.push_back(DicomTransferSyntax_LittleEndianImplicit);
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 if (sourceSyntax != DicomTransferSyntax_LittleEndianExplicit)
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 preferred.push_back(DicomTransferSyntax_LittleEndianExplicit);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	183 }
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 if (sourceSyntax != DicomTransferSyntax_BigEndianExplicit)
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 // Retired
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	188 preferred.push_back(DicomTransferSyntax_BigEndianExplicit);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	189 }
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
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 * 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	195 * accepted.
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	196 **/
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 for (std::list<DicomTransferSyntax>::const_iterator
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	199 it = preferred.begin(); it != preferred.end(); ++it)
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	200 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	201 Accepted::const_iterator found = accepted.find(*it);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	202 if (found != accepted.end())
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 selectedPresentationId = found->second;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	205 selectedSyntax = *it;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	206 return true;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	207 }
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 // No preferred syntax was accepted
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	211 return false;
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
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	214
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	215 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	216 const std::string& sopClassUid,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	217 const std::string& sopInstanceUid,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	218 DcmFileFormat* dicomRaw)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	219 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	220 assert(dicomRaw != NULL);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	221 std::unique_ptr<DcmFileFormat> dicom(dicomRaw);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	222
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	223 DicomTransferSyntax sourceSyntax;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	224 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(sourceSyntax, *dicom))
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	225 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	226 failedCount_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	227 AddFailedUIDInstance(sopInstanceUid);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	228 throw OrthancException(ErrorCode_NetworkProtocol,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	229 "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	230 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	231 ") " + sopClassUid);
3959 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
3972 7f8b30416d50 minor clarification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3970 diff changeset	234 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	235 DicomTransferSyntax selectedSyntax;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	236 if (!SelectPresentationContext(presId, selectedSyntax, assoc, sopClassUid,
4482 8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	237 sourceSyntax, allowTranscoding_) \|\|
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	238 presId == 0)
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	239 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	240 failedCount_++;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	241 AddFailedUIDInstance(sopInstanceUid);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	242 throw OrthancException(ErrorCode_NetworkProtocol,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	243 "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	244 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	245 ") " + sopClassUid);
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	246 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	247 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	248 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	249 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	250 << ", for source instance with SOP class " << sopClassUid
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	251 << " and transfer syntax " << GetTransferSyntaxUid(sourceSyntax);
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	252
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	253 // 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	254 T_ASC_PresentationContext pc;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	255 ASC_findAcceptedPresentationContext(assoc->params, presId, &pc);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	256 // the acceptedRole is the association requestor role
3966 fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	257
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	258 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	259 pc.acceptedRole != ASC_SC_ROLE_SCP &&
fde1355a625a c-get compatibility with ginkgocadx Sebastien Jodogne <s.jodogne@gmail.com> parents: 3963 diff changeset	260 pc.acceptedRole != ASC_SC_ROLE_SCUSCP)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	261 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	262 // 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	263 failedCount_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	264 AddFailedUIDInstance(sopInstanceUid);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	265 throw OrthancException(ErrorCode_NetworkProtocol,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	266 "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	267 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	268 ") " + sopClassUid);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	269 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	270 }
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	271
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	272 const DIC_US msgId = assoc->nextMsgID++;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	273
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	274 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	275 memset(&req, 0, sizeof(req));
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	276 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	277 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	278 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	279 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	280 req.Priority = DIMSE_PRIORITY_MEDIUM;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	281 req.opts = 0;
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 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	284 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	285
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	286 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	287 << dcmSOPClassUIDToModality(sopClassUid.c_str(), "OT") << ")";
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	288
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	289 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	290 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	291
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	292 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	293
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	294 OFCondition cond;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	295
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	296 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	297 {
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	298 // 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	299 DcmDataset *stDetailTmp = NULL;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	300 cond = DIMSE_storeUser(
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	301 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	302 ProgressCallback, NULL /* callbackData */,
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	303 (timeout_ > 0 ? DIMSE_NONBLOCKING : DIMSE_BLOCKING), timeout_,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	304 &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	305 stDetail.reset(stDetailTmp);
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	306 }
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	307 else
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	308 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	309 // Transcoding to the selected uncompressed transfer syntax
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	310 IDicomTranscoder::DicomImage source, transcoded;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	311 source.AcquireParsed(dicom.release());
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	312
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	313 std::set<DicomTransferSyntax> ts;
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	314 ts.insert(selectedSyntax);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	315
5363 3c8286e5d07b wip: try to add a jpeg decoder without colorspace conversion: not working now Alain Mazy <am@osimis.io> parents: 5185 diff changeset	316 if (context_.Transcode(transcoded, source, ts, true, true))
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	317 {
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	318 // Transcoding has succeeded
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	319 DcmDataset *stDetailTmp = NULL;
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 */,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	322 transcoded.GetParsed().getDataset(),
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	323 ProgressCallback, NULL /* callbackData */,
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	324 (timeout_ > 0 ? DIMSE_NONBLOCKING : DIMSE_BLOCKING), timeout_,
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	325 &rsp, &stDetailTmp, &cancelParameters);
76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	326 stDetail.reset(stDetailTmp);
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 else
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 // Cannot transcode
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	331 failedCount_++;
3959 76a24be12912 c-get: support of transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 3955 diff changeset	332 AddFailedUIDInstance(sopInstanceUid);
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	333 throw OrthancException(ErrorCode_NotImplemented,
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	334 "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	335 " 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	336 " to " + GetTransferSyntaxUid(selectedSyntax));
3959 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 }
4257 c046d559edb3 Fix reporting of client-side store warnings/errors in C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	339
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	340 bool isContinue;
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	341
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	342 if (cond.good())
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	343 {
4286 526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	344 {
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	345 OFString str;
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	346 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	347 << 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	348 }
526bd8bad850 debug logs for C-MOVE and C-GET SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	349
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	350 if (cancelParameters.cancelEncountered)
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	351 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	352 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	353 isContinue = false;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	354 }
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	355 else if (rsp.DimseStatus == STATUS_Success)
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	356 {
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	357 // everything ok
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	358 completedCount_++;
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	359 isContinue = true;
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	360 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	361 else if ((rsp.DimseStatus & 0xf000) == 0xb000)
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	362 {
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	363 // a warning status message
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	364 warningCount_++;
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	365 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	366 << 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	367 isContinue = true;
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	368 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	369 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	370 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	371 failedCount_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	372 AddFailedUIDInstance(sopInstanceUid);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	373 // print a status message
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	374 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	375 << 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	376 isContinue = true;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	377 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	378 }
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	379 else
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	380 {
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	381 failedCount_++;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	382 AddFailedUIDInstance(sopInstanceUid);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	383 OFString temp_str;
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	384 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	385 << 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	386 isContinue = true;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	387 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	388
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	389 if (stDetail.get() != NULL)
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	390 {
4288 5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4287 diff changeset	391 std::stringstream s; // DcmObject::PrintHelper cannot be used with VS2008
5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4287 diff changeset	392 stDetail->print(s);
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	393 CLOG(INFO, DICOM) << " Status Detail: " << s.str();
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	394 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	395
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	396 return isContinue;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	397 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	398
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	399 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	400 ResourceType level,
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	401 const DicomMap& input) const
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	402 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	403 DicomTag tag(0, 0); // Dummy initialization
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	404
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	405 switch (level)
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	406 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	407 case ResourceType_Patient:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	408 tag = DICOM_TAG_PATIENT_ID;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	409 break;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	410
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	411 case ResourceType_Study:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	412 tag = (input.HasTag(DICOM_TAG_ACCESSION_NUMBER) ?
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	413 DICOM_TAG_ACCESSION_NUMBER : DICOM_TAG_STUDY_INSTANCE_UID);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	414 break;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	415
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	416 case ResourceType_Series:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	417 tag = DICOM_TAG_SERIES_INSTANCE_UID;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	418 break;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	419
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	420 case ResourceType_Instance:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	421 tag = DICOM_TAG_SOP_INSTANCE_UID;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	422 break;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	423
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	424 default:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	425 throw OrthancException(ErrorCode_ParameterOutOfRange);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	426 }
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 if (!input.HasTag(tag))
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 return false;
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
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	433 const DicomValue& value = input.GetValue(tag);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	434 if (value.IsNull() \|\|
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	435 value.IsBinary())
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	436 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	437 return false;
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 else
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	440 {
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	441 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	442 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	443
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	444 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	445 {
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	446 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	447 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	448
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	449 if (tmp.empty())
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	450 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	451 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	452 << "\" 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	453 return false;
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	454 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	455 else
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	456 {
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	457 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	458 {
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	459 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	460 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	461 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	462 }
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	463
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	464 return true;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	465 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	466 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	467
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	468
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	469 OrthancGetRequestHandler::OrthancGetRequestHandler(ServerContext& context) :
4482 8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	470 context_(context),
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	471 position_(0),
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	472 completedCount_ (0),
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	473 warningCount_(0),
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	474 failedCount_(0),
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	475 timeout_(0),
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	476 allowTranscoding_(false)
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	477 {
5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	478 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	479
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	480
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	481 bool OrthancGetRequestHandler::Handle(const DicomMap& input,
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	482 const std::string& originatorIp,
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	483 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	484 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	485 uint32_t timeout)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	486 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	487 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	488
4806 753f87dac208 changed log levels Alain Mazy <am@osimis.io> parents: 4669 diff changeset	489 CLOG(INFO, 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	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 DicomArray query(input);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	493 for (size_t i = 0; i < query.GetSize(); i++)
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	494 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	495 if (!query.GetElement(i).GetValue().IsNull())
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	496 {
4313 91554aecff9a removed a friend method for better abi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	497 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	498 << ") " << FromDcmtkBridge::GetTagName(query.GetElement(i))
4376 b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	499 << " = " << context_.GetDeidentifiedContent(query.GetElement(i));
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	500 }
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
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	504 /**
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	505 * Retrieve the query level.
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	506 **/
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	507
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	508 const DicomValue* levelTmp = input.TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL);
4376 b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	509 if (levelTmp == NULL \|\|
b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	510 levelTmp->IsNull() \|\|
b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	511 levelTmp->IsBinary())
b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	512 {
b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	513 throw OrthancException(ErrorCode_BadRequest,
b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	514 "C-GET request without the tag 0008,0052 (QueryRetrieveLevel)");
b002f9abe802 review of changeset 4375:208029732d51 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4375 diff changeset	515 }
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 ResourceType level = StringToResourceType(levelTmp->GetContent().c_str());
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
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 * Lookup for the resource to be sent.
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
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	524 std::list<std::string> publicIds;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	525
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	526 if (!LookupIdentifiers(publicIds, level, input))
67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	527 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	528 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	529 return false;
67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	530 }
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	531
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	532 localAet_ = context_.GetDefaultLocalApplicationEntityTitle();
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	533 position_ = 0;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	534 originatorAet_ = originatorAet;
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 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	537 OrthancConfiguration::ReaderLock lock;
4482 8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	538
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	539 RemoteModalityParameters remote;
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	540
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	541 if (lock.GetConfiguration().LookupDicomModalityUsingAETitle(remote, originatorAet))
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	542 {
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	543 allowTranscoding_ = (context_.IsTranscodeDicomProtocol() &&
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	544 remote.IsTranscodingAllowed());
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	545 }
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	546 else if (lock.GetConfiguration().GetBooleanParameter("DicomAlwaysAllowGet", false))
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	547 {
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	548 CLOG(INFO, DICOM) << "C-GET: Allowing SCU request from unknown modality with AET: " << originatorAet;
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	549 allowTranscoding_ = context_.IsTranscodeDicomProtocol();
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	550 }
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	551 else
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	552 {
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	553 // This should never happen, given the test at bottom of
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	554 // "OrthancApplicationEntityFilter::IsAllowedRequest()"
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	555 throw OrthancException(ErrorCode_InexistentItem,
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	556 "C-GET: Rejecting SCU request from unknown modality with AET: " + originatorAet);
8efeaba1b7f9 new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	557 }
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	558 }
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	559
66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	560 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	561 resource = publicIds.begin(); resource != publicIds.end(); ++resource)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	562 {
4287 5a3374b6e707 using CLOG in Orthanc DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4286 diff changeset	563 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	564 << " to modality \"" << originatorAet << "\"";
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	565
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	566 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	567 context_.GetIndex().GetChildInstances(tmp, *resource);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	568
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	569 instances_.reserve(tmp.size());
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	570 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	571 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	572 instances_.push_back(*it);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	573 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	574 }
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	575
620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3859 diff changeset	576 failedUIDs_.clear();
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	577
4258 6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	578 completedCount_ = 0;
6f5d4bfb2c90 C-GET SCP: Fix responses and handling of cancel Sebastien Jodogne <s.jodogne@gmail.com> parents: 4257 diff changeset	579 failedCount_ = 0;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	580 warningCount_ = 0;
3955 66879215cbf3 C-GET: add timeout, fix uninitalized priority, support multiple resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 3954 diff changeset	581 timeout_ = timeout;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	582
3954 67b457283499 coding style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3953 diff changeset	583 return true;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	584 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: diff changeset	585 };

Mercurial > hg > orthanc

annotate OrthancServer/Sources/OrthancGetRequestHandler.cpp @ 5363:3c8286e5d07b multiple-jpeg-decoders