Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomNetworking/Internals/FindScp.cpp @ 4466:2243f1bb909b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ABI compatibility for DicomStoreUserConnection::Transcode()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Jan 2021 17:54:44 +0100
parents d9473bd5ed43
children 8efeaba1b7f9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1859
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288
6e7e5ed91c2d upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 941
diff changeset
4 * Department, University Hospital of Liege, Belgium
4437
d9473bd5ed43 upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4288
diff changeset
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
8 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
10 * the License, or (at your option) any later version.
136
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
11 *
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
15 * Lesser General Public License for more details.
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
18 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
19 * <http://www.gnu.org/licenses/>.
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 **/
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
23
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
24
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
25 /*=========================================================================
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
26
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
27 This file is based on portions of the following project:
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
28
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
29 Program: DCMTK 3.6.0
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
30 Module: http://dicom.offis.de/dcmtk.php.en
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
31
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
32 Copyright (C) 1994-2011, OFFIS e.V.
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
33 All rights reserved.
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
34
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
35 This software and supporting documentation were developed by
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
36
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
37 OFFIS e.V.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
38 R&D Division Health
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
39 Escherweg 2
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
40 26121 Oldenburg, Germany
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
41
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
42 Redistribution and use in source and binary forms, with or without
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
43 modification, are permitted provided that the following conditions
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
44 are met:
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
45
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
46 - Redistributions of source code must retain the above copyright
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
47 notice, this list of conditions and the following disclaimer.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
48
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
49 - Redistributions in binary form must reproduce the above copyright
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
50 notice, this list of conditions and the following disclaimer in the
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
51 documentation and/or other materials provided with the distribution.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
52
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
53 - Neither the name of OFFIS nor the names of its contributors may be
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
54 used to endorse or promote products derived from this software
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
55 without specific prior written permission.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
56
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
57 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
58 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
59 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
60 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
61 HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
62 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
63 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
64 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
65 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
66 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
67 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
68
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
69 =========================================================================*/
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
70
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
71
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 722
diff changeset
72
2382
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
73 #include "../../PrecompiledHeaders.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 #include "FindScp.h"
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75
3451
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3108
diff changeset
76 #include "../../DicomFormat/DicomArray.h"
2382
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
77 #include "../../DicomParsing/FromDcmtkBridge.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
78 #include "../../DicomParsing/ToDcmtkBridge.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
79 #include "../../Logging.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
80 #include "../../OrthancException.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81
1787
1b1d5470233f refactoring of DicomFindAnswers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1786
diff changeset
82 #include <dcmtk/dcmdata/dcfilefo.h>
2204
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
83 #include <dcmtk/dcmdata/dcdeftag.h>
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
84
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
85
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
86
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
87 /**
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
88 * The function below is extracted from DCMTK 3.6.0, cf. file
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
89 * "dcmtk-3.6.0/dcmwlm/libsrc/wldsfs.cc".
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
90 **/
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
91
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
92 static void HandleExistentButEmptyReferencedStudyOrPatientSequenceAttributes(DcmDataset *dataset,
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
93 const DcmTagKey &sequenceTagKey)
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
94 // Date : May 3, 2005
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
95 // Author : Thomas Wilkens
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
96 // Task : This function performs a check on a sequence attribute in the given dataset. At two different places
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
97 // in the definition of the DICOM worklist management service, a sequence attribute with a return type
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
98 // of 2 is mentioned containing two 1C attributes in its item; the condition of the two 1C attributes
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
99 // specifies that in case a sequence item is present, then these two attributes must be existent and
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
100 // must contain a value. (I am talking about ReferencedStudySequence and ReferencedPatientSequence.)
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
101 // In cases where the sequence attribute contains exactly one item with an empty ReferencedSOPClass
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
102 // and an empty ReferencedSOPInstance, we want to remove the item from the sequence. This is what
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
103 // this function does.
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
104 // Parameters : dataset - [in] Dataset in which the consistency of the sequence attribute shall be checked.
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
105 // sequenceTagKey - [in] DcmTagKey of the sequence attribute which shall be checked.
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
106 // Return Value : none.
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
107 {
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
108 DcmElement *sequenceAttribute = NULL, *referencedSOPClassUIDAttribute = NULL, *referencedSOPInstanceUIDAttribute = NULL;
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
109
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
110 // in case the sequence attribute contains exactly one item with an empty
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
111 // ReferencedSOPClassUID and an empty ReferencedSOPInstanceUID, remove the item
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
112 if( dataset->findAndGetElement( sequenceTagKey, sequenceAttribute ).good() &&
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
113 ( (DcmSequenceOfItems*)sequenceAttribute )->card() == 1 &&
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
114 ( (DcmSequenceOfItems*)sequenceAttribute )->getItem(0)->findAndGetElement( DCM_ReferencedSOPClassUID, referencedSOPClassUIDAttribute ).good() &&
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
115 referencedSOPClassUIDAttribute->getLength() == 0 &&
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
116 ( (DcmSequenceOfItems*)sequenceAttribute )->getItem(0)->findAndGetElement( DCM_ReferencedSOPInstanceUID, referencedSOPInstanceUIDAttribute, OFFalse ).good() &&
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
117 referencedSOPInstanceUIDAttribute->getLength() == 0 )
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
118 {
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
119 DcmItem *item = ((DcmSequenceOfItems*)sequenceAttribute)->remove( ((DcmSequenceOfItems*)sequenceAttribute)->getItem(0) );
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
120 delete item;
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
121 }
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
122 }
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
123
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
124
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
126 namespace Orthanc
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 namespace
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 struct FindScpData
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 {
2381
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2256
diff changeset
132 DicomServer::IRemoteModalities* modalities_;
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
133 IFindRequestHandler* findHandler_;
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
134 IWorklistRequestHandler* worklistHandler_;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 DicomFindAnswers answers_;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 DcmDataset* lastRequest_;
1573
3309878b3e16 more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
137 const std::string* remoteIp_;
3309878b3e16 more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
138 const std::string* remoteAet_;
1799
4f01c9d73f02 calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
139 const std::string* calledAet_;
2059
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
140
4200
7112a8af0b63 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4137
diff changeset
141 FindScpData() :
7112a8af0b63 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4137
diff changeset
142 modalities_(NULL),
7112a8af0b63 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4137
diff changeset
143 findHandler_(NULL),
7112a8af0b63 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4137
diff changeset
144 worklistHandler_(NULL),
7112a8af0b63 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4137
diff changeset
145 answers_(false),
7112a8af0b63 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4137
diff changeset
146 lastRequest_(NULL),
7112a8af0b63 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4137
diff changeset
147 remoteIp_(NULL),
7112a8af0b63 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4137
diff changeset
148 remoteAet_(NULL),
7112a8af0b63 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4137
diff changeset
149 calledAet_(NULL)
2059
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
150 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
151 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 };
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154
2204
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
155
4203
4d42408da117 improving const-correctness in ParsedDicomFile
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4200
diff changeset
156 static void FixWorklistQuery(ParsedDicomFile& query)
2204
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
157 {
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
158 // TODO: Check out
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
159 // WlmDataSourceFileSystem::HandleExistentButEmptyDescriptionAndCodeSequenceAttributes()"
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
160 // in DCMTK 3.6.0
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
161
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
162 DcmDataset* dataset = query.GetDcmtkObject().getDataset();
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
163 HandleExistentButEmptyReferencedStudyOrPatientSequenceAttributes(dataset, DCM_ReferencedStudySequence);
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
164 HandleExistentButEmptyReferencedStudyOrPatientSequenceAttributes(dataset, DCM_ReferencedPatientSequence);
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
165 }
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
166
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
167
3108
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
168 static void FixFindQuery(DicomMap& target,
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
169 const DicomMap& source)
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
170 {
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
171 // "The definition of a Data Set in PS3.5 specifically excludes
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
172 // the range of groups below group 0008, and this includes in
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
173 // particular Meta Information Header elements such as Transfer
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
174 // Syntax UID (0002,0010)."
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
175 // http://dicom.nema.org/medical/dicom/current/output/chtml/part04/sect_C.4.html#sect_C.4.1.1.3
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
176 // https://groups.google.com/d/msg/orthanc-users/D3kpPuX8yV0/_zgHOzkMEQAJ
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
177
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
178 DicomArray a(source);
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
179
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
180 for (size_t i = 0; i < a.GetSize(); i++)
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
181 {
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
182 if (a.GetElement(i).GetTag().GetGroup() >= 0x0008)
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
183 {
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
184 target.SetValue(a.GetElement(i).GetTag(), a.GetElement(i).GetValue());
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
185 }
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
186 }
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
187 }
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
188
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
189
2204
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
190
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 void FindScpCallback(
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 /* in */
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 void *callbackData,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 OFBool cancelled,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 T_DIMSE_C_FindRQ *request,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 DcmDataset *requestIdentifiers,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 int responseCount,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 /* out */
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 T_DIMSE_C_FindRSP *response,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 DcmDataset **responseIdentifiers,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 DcmDataset **statusDetail)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 {
4286
526bd8bad850 debug logs for C-MOVE and C-GET SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4285
diff changeset
203 assert(response != NULL);
4285
544120b34c09 fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4284
diff changeset
204 assert(requestIdentifiers != NULL);
544120b34c09 fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4284
diff changeset
205
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 bzero(response, sizeof(T_DIMSE_C_FindRSP));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 *statusDetail = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
209 std::string sopClassUid(request->AffectedSOPClassUID);
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
210
656
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 618
diff changeset
211 FindScpData& data = *reinterpret_cast<FindScpData*>(callbackData);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212 if (data.lastRequest_ == NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213 {
4285
544120b34c09 fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4284
diff changeset
214 {
4288
5b254bd435d3 fix for VS2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4286
diff changeset
215 std::stringstream s; // DcmObject::PrintHelper cannot be used with VS2008
5b254bd435d3 fix for VS2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4286
diff changeset
216 requestIdentifiers->print(s);
4285
544120b34c09 fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4284
diff changeset
217 CLOG(TRACE, DICOM) << "Received C-FIND Request:" << std::endl << s.str();
544120b34c09 fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4284
diff changeset
218 }
544120b34c09 fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4284
diff changeset
219
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
220 bool ok = false;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222 try
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 {
2256
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
224 RemoteModalityParameters modality;
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
225
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
226 /**
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
227 * Ensure that the remote modality is known to Orthanc for C-FIND requests.
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
228 **/
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
229
2381
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2256
diff changeset
230 assert(data.modalities_ != NULL);
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2256
diff changeset
231 if (!data.modalities_->LookupAETitle(modality, *data.remoteAet_))
2256
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
232 {
2954
d924f9bb61cc taking advantage of details in OrthancException
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
233 throw OrthancException(ErrorCode_UnknownModality,
d924f9bb61cc taking advantage of details in OrthancException
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
234 "Modality with AET \"" + (*data.remoteAet_) +
d924f9bb61cc taking advantage of details in OrthancException
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
235 "\" is not defined in the \"DicomModalities\" configuration option");
2256
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
236 }
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
237
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
238
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
239 if (sopClassUid == UID_FINDModalityWorklistInformationModel)
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
240 {
2059
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
241 data.answers_.SetWorklist(true);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
242
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
243 if (data.worklistHandler_ != NULL)
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
244 {
1788
6a2d507ef064 getting rid of opaque data structures
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1787
diff changeset
245 ParsedDicomFile query(*requestIdentifiers);
2204
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
246 FixWorklistQuery(query);
0158f2de8cad Fix handling of worklist SCP with ReferencedStudySequence and ReferencedPatientSequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
247
1800
30e97a1f4093 callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1799
diff changeset
248 data.worklistHandler_->Handle(data.answers_, query,
30e97a1f4093 callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1799
diff changeset
249 *data.remoteIp_, *data.remoteAet_,
2256
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
250 *data.calledAet_, modality.GetManufacturer());
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
251 ok = true;
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
252 }
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
253 else
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
254 {
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
255 CLOG(ERROR, DICOM) << "No worklist handler is installed, cannot handle this C-FIND request";
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
256 }
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
257 }
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
258 else
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
259 {
2059
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
260 data.answers_.SetWorklist(false);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
261
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
262 if (data.findHandler_ != NULL)
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
263 {
1859
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
264 std::list<DicomTag> sequencesToReturn;
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
265
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
266 for (unsigned long i = 0; i < requestIdentifiers->card(); i++)
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
267 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
268 DcmElement* element = requestIdentifiers->getElement(i);
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
269 if (element && !element->isLeaf())
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
270 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
271 const DicomTag tag(FromDcmtkBridge::Convert(element->getTag()));
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
272
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
273 DcmSequenceOfItems& sequence = dynamic_cast<DcmSequenceOfItems&>(*element);
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
274 if (sequence.card() != 0)
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
275 {
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
276 CLOG(WARNING, DICOM) << "Orthanc only supports sequence matching on worklists, "
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
277 << "ignoring C-FIND SCU constraint on tag (" << tag.Format()
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
278 << ") " << FromDcmtkBridge::GetTagName(*element);
1859
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
279 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
280
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
281 sequencesToReturn.push_back(tag);
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
282 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
283 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1800
diff changeset
284
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
285 DicomMap input;
4137
6774605d4341 keep only one signature for FromDcmtkBridge::ExtractDicomSummary()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4136
diff changeset
286 std::set<DicomTag> ignoreTagLength;
6774605d4341 keep only one signature for FromDcmtkBridge::ExtractDicomSummary()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4136
diff changeset
287 FromDcmtkBridge::ExtractDicomSummary(input, *requestIdentifiers, 0 /* don't truncate tags */, ignoreTagLength);
2125
b9bd52c72ba2 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2115
diff changeset
288
3108
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
289 DicomMap filtered;
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
290 FixFindQuery(filtered, input);
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
291
55dacaf139ed Don't consider tags whose group is below 0x0008 in C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
292 data.findHandler_->Handle(data.answers_, filtered, sequencesToReturn,
1800
30e97a1f4093 callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1799
diff changeset
293 *data.remoteIp_, *data.remoteAet_,
2256
de1ba22fd28a simplification wrt. modality manufacturers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
294 *data.calledAet_, modality.GetManufacturer());
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
295 ok = true;
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
296 }
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
297 else
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
298 {
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
299 CLOG(ERROR, DICOM) << "No C-Find handler is installed, cannot handle this request";
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
300 }
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
301 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 }
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
303 catch (OrthancException& e)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
304 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
305 // Internal error!
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
306 CLOG(ERROR, DICOM) << "C-FIND request handler has failed: " << e.What();
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
307 }
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
308
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
309 if (!ok)
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
310 {
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
311 response->DimseStatus = STATUS_FIND_Failed_UnableToProcess;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
312 *responseIdentifiers = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
313 return;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
314 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
315
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
316 data.lastRequest_ = requestIdentifiers;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
317 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
318 else if (data.lastRequest_ != requestIdentifiers)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
319 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
320 // Internal error!
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
321 response->DimseStatus = STATUS_FIND_Failed_UnableToProcess;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
322 *responseIdentifiers = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
323 return;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
324 }
722
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 689
diff changeset
325
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
326 if (responseCount <= static_cast<int>(data.answers_.GetSize()))
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
327 {
941
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
328 // There are pending results that are still to be sent
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
329 response->DimseStatus = STATUS_Pending;
1789
bdcc1dba4a53 optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1788
diff changeset
330 *responseIdentifiers = data.answers_.ExtractDcmDataset(responseCount - 1);
4286
526bd8bad850 debug logs for C-MOVE and C-GET SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4285
diff changeset
331
526bd8bad850 debug logs for C-MOVE and C-GET SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4285
diff changeset
332 if (*responseIdentifiers)
526bd8bad850 debug logs for C-MOVE and C-GET SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4285
diff changeset
333 {
4288
5b254bd435d3 fix for VS2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4286
diff changeset
334 std::stringstream s; // DcmObject::PrintHelper cannot be used with VS2008
5b254bd435d3 fix for VS2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4286
diff changeset
335 (*responseIdentifiers)->print(s);
4286
526bd8bad850 debug logs for C-MOVE and C-GET SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4285
diff changeset
336 OFString str;
526bd8bad850 debug logs for C-MOVE and C-GET SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4285
diff changeset
337 CLOG(TRACE, DICOM) << "Sending C-FIND Response "
526bd8bad850 debug logs for C-MOVE and C-GET SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4285
diff changeset
338 << responseCount << "/" << data.answers_.GetSize() << ":" << std::endl
526bd8bad850 debug logs for C-MOVE and C-GET SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4285
diff changeset
339 << s.str();
526bd8bad850 debug logs for C-MOVE and C-GET SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4285
diff changeset
340 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
341 }
1800
30e97a1f4093 callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1799
diff changeset
342 else if (data.answers_.IsComplete())
941
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
343 {
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
344 // Success: All the results have been sent
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
345 response->DimseStatus = STATUS_Success;
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
346 *responseIdentifiers = NULL;
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
347 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
348 else
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
349 {
941
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
350 // Success, but the results were too numerous and had to be cropped
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
351 CLOG(WARNING, DICOM) << "Too many results for an incoming C-FIND query";
941
83489fddd8c5 Options to limit the number of results for an incoming C-FIND query
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
352 response->DimseStatus = STATUS_FIND_Cancel_MatchingTerminatedDueToCancelRequest;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
353 *responseIdentifiers = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
354 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
355 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
356 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
357
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
358
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
359 OFCondition Internals::findScp(T_ASC_Association * assoc,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
360 T_DIMSE_Message * msg,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
361 T_ASC_PresentationContextID presID,
2381
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2256
diff changeset
362 DicomServer::IRemoteModalities& modalities,
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
363 IFindRequestHandler* findHandler,
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
364 IWorklistRequestHandler* worklistHandler,
1573
3309878b3e16 more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
365 const std::string& remoteIp,
1799
4f01c9d73f02 calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
366 const std::string& remoteAet,
3704
58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
367 const std::string& calledAet,
58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
368 int timeout)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
369 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
370 FindScpData data;
2381
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2256
diff changeset
371 data.modalities_ = &modalities;
1786
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
372 data.findHandler_ = findHandler;
164d78911382 primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
373 data.worklistHandler_ = worklistHandler;
2381
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2256
diff changeset
374 data.lastRequest_ = NULL;
1573
3309878b3e16 more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
375 data.remoteIp_ = &remoteIp;
3309878b3e16 more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
376 data.remoteAet_ = &remoteAet;
1799
4f01c9d73f02 calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
377 data.calledAet_ = &calledAet;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
378
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
379 OFCondition cond = DIMSE_findProvider(assoc, presID, &msg->msg.CFindRQ,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
380 FindScpCallback, &data,
3704
58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
381 /*opt_blockMode*/ (timeout ? DIMSE_NONBLOCKING : DIMSE_BLOCKING),
58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
382 /*opt_dimse_timeout*/ timeout);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
383
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
384 // if some error occured, dump corresponding information and remove the outfile if necessary
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
385 if (cond.bad())
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
386 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
387 OFString temp_str;
4284
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4203
diff changeset
388 CLOG(ERROR, DICOM) << "Find SCP Failed: " << cond.text();
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
389 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
390
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
391 return cond;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
392 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
393 }