Mercurial > hg > orthanc

annotate Core/DicomNetworking/DicomUserConnection.cpp @ 3801:9fe1d64a748c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to civetweb 1.12, error reporting if OpenSSL failure
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 02 Apr 2020 11:24:47 +0200
parents 38b0f51781aa
children 7f083dfae62b
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: 1846
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288
6e7e5ed91c2d upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1285
diff changeset
4 * Department, University Hospital of Liege, Belgium
3640
94f4a18a79cc upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
5 * Copyright (C) 2017-2020 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
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * License, or (at your option) any later version.
136
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
11 *
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
13 * program give permission to link the code of its release with the
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
22 * in the program, then also delete it here.
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * 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
25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 * General Public License for more details.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 **/
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33
766
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
34
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
35 /*=========================================================================
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
36
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
37 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: 763
diff changeset
38
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
39 Program: DCMTK 3.6.0
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
40 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: 763
diff changeset
41
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
42 Copyright (C) 1994-2011, OFFIS e.V.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
43 All rights reserved.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
44
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
45 This software and supporting documentation were developed by
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
46
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
47 OFFIS e.V.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
48 R&D Division Health
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
49 Escherweg 2
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
50 26121 Oldenburg, Germany
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
51
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
52 Redistribution and use in source and binary forms, with or without
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
53 modification, are permitted provided that the following conditions
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
54 are met:
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
55
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
56 - Redistributions of source code must retain the above copyright
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
57 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: 763
diff changeset
58
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
59 - Redistributions in binary form must reproduce the above copyright
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
60 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: 763
diff changeset
61 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: 763
diff changeset
62
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
63 - Neither the name of OFFIS nor the names of its contributors may be
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
64 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: 763
diff changeset
65 without specific prior written permission.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
66
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
67 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
68 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
69 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
70 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
71 HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
72 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
73 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
74 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
75 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
76 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
77 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
78
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
79 =========================================================================*/
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
80
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
81
2382
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
82 #include "../PrecompiledHeaders.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 #include "DicomUserConnection.h"
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84
3117
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
85 #if !defined(DCMTK_VERSION_NUMBER)
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
86 # error The macro DCMTK_VERSION_NUMBER must be defined
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
87 #endif
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
88
3767
c6658187e4b1 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3741
diff changeset
89 #include "../Compatibility.h"
2382
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
90 #include "../DicomFormat/DicomArray.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
91 #include "../Logging.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
92 #include "../OrthancException.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
93 #include "../DicomParsing/FromDcmtkBridge.h"
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2381
diff changeset
94 #include "../DicomParsing/ToDcmtkBridge.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
96 #include <dcmtk/dcmdata/dcdeftag.h>
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
97 #include <dcmtk/dcmdata/dcfilefo.h>
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 #include <dcmtk/dcmdata/dcistrmb.h>
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 #include <dcmtk/dcmdata/dcistrmf.h>
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
100 #include <dcmtk/dcmdata/dcmetinf.h>
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 #include <dcmtk/dcmnet/diutil.h>
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 #include <set>
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 #ifdef _WIN32
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 /**
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 * "The maximum length, in bytes, of the string returned in the buffer
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 * pointed to by the name parameter is dependent on the namespace provider,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 * but this string must be 256 bytes or less.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 * http://msdn.microsoft.com/en-us/library/windows/desktop/ms738527(v=vs.85).aspx
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 **/
2340
b5a04d983647 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2335
diff changeset
113 # define HOST_NAME_MAX 256
b5a04d983647 fix mingw build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2335
diff changeset
114 # include <winsock.h>
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 #endif
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
918
ac8f68cbdbb6 build cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 725
diff changeset
118 #if !defined(HOST_NAME_MAX) && defined(_POSIX_HOST_NAME_MAX)
890
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
119 /**
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
120 * TO IMPROVE: "_POSIX_HOST_NAME_MAX is only the minimum value that
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
121 * HOST_NAME_MAX can ever have [...] Therefore you cannot allocate an
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
122 * array of size _POSIX_HOST_NAME_MAX, invoke gethostname() and expect
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
123 * that the result will fit."
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
124 * http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00128.html
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
125 **/
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
126 #define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
127 #endif
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
128
816dccaeb7cf Support of kFreeBSD
jodogne
parents: 831
diff changeset
129
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
130 static const char* DEFAULT_PREFERRED_TRANSFER_SYNTAX = UID_LittleEndianImplicitTransferSyntax;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
131
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
132 /**
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
133 * "If we have more than 64 storage SOP classes, tools such as
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
134 * storescu will fail because they attempt to negotiate two
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
135 * presentation contexts for each SOP class, and there is a total
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
136 * limit of 128 contexts for one association."
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
137 **/
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
138 static const unsigned int MAXIMUM_STORAGE_SOP_CLASSES = 64;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
139
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
140
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
141 namespace Orthanc
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 {
2069
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
143 // By default, the timeout for DICOM SCU (client) connections is set to 10 seconds
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
144 static uint32_t defaultTimeout_ = 10;
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
145
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 struct DicomUserConnection::PImpl
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 // Connection state
1186
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
149 uint32_t dimseTimeout_;
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
150 uint32_t acseTimeout_;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 T_ASC_Network* net_;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 T_ASC_Parameters* params_;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 T_ASC_Association* assoc_;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 bool IsOpen() const
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 return assoc_ != NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 void CheckIsOpen() const;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161
3734
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
162 void Store(std::string& sopClassUidOut /* out */,
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
163 std::string& sopInstanceUidOut /* out */,
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
164 DcmInputStream& is,
1907
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
165 DicomUserConnection& connection,
2222
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2202
diff changeset
166 const std::string& moveOriginatorAET,
1997
f9f2aa1cc594 "MoveOriginatorID" can be specified for /modalities/.../store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
167 uint16_t moveOriginatorID);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 };
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170
3208
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
171 static void Check(const OFCondition& cond,
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
172 const std::string& aet,
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
173 const std::string& command)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 if (cond.bad())
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 {
3208
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
177 // Reformat the error message from DCMTK by turning multiline
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
178 // errors into a single line
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
179
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
180 std::string s(cond.text());
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
181 std::string info;
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
182 info.reserve(s.size());
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
183
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
184 bool isMultiline = false;
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
185 for (size_t i = 0; i < s.size(); i++)
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
186 {
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
187 if (s[i] == '\r')
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
188 {
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
189 // Ignore
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
190 }
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
191 else if (s[i] == '\n')
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
192 {
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
193 if (isMultiline)
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
194 {
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
195 info += "; ";
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
196 }
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
197 else
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
198 {
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
199 info += " (";
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
200 isMultiline = true;
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
201 }
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
202 }
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
203 else
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
204 {
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
205 info.push_back(s[i]);
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
206 }
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
207 }
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
208
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
209 if (isMultiline)
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
210 {
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
211 info += ")";
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
212 }
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
213
2954
d924f9bb61cc taking advantage of details in OrthancException
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2888
diff changeset
214 throw OrthancException(ErrorCode_NetworkProtocol,
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
215 "DicomUserConnection - " + command +
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
216 " to AET \"" + aet + "\": " + info);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220 void DicomUserConnection::PImpl::CheckIsOpen() const
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 if (!IsOpen())
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 {
2954
d924f9bb61cc taking advantage of details in OrthancException
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2888
diff changeset
224 throw OrthancException(ErrorCode_NetworkProtocol,
d924f9bb61cc taking advantage of details in OrthancException
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2888
diff changeset
225 "DicomUserConnection: First open the connection");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 void DicomUserConnection::CheckIsOpen() const
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232 pimpl_->CheckIsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
236 static void RegisterStorageSOPClass(T_ASC_Parameters* params,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
237 unsigned int& presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
238 const std::string& sopClass,
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
239 const char* asPreferred[],
3208
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
240 std::vector<const char*>& asFallback,
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
241 const std::string& aet)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242 {
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
243 Check(ASC_addPresentationContext(params, presentationContextId,
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
244 sopClass.c_str(), asPreferred, 1),
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
245 aet, "initializing");
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
246 presentationContextId += 2;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
247
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
248 if (asFallback.size() > 0)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
249 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
250 Check(ASC_addPresentationContext(params, presentationContextId,
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
251 sopClass.c_str(), &asFallback[0], asFallback.size()),
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
252 aet, "initializing");
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
253 presentationContextId += 2;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
254 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
255 }
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
256
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
257
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
258 void DicomUserConnection::SetupPresentationContexts(Mode mode,
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
259 const std::string& preferredTransferSyntax)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 {
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
261 // Flatten an array with the preferred transfer syntax
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
262 const char* asPreferred[1] = { preferredTransferSyntax.c_str() };
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
263
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
264 // Setup the fallback transfer syntaxes
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
265 std::set<std::string> fallbackSyntaxes;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
266 fallbackSyntaxes.insert(UID_LittleEndianExplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
267 fallbackSyntaxes.insert(UID_BigEndianExplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
268 fallbackSyntaxes.insert(UID_LittleEndianImplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
269 fallbackSyntaxes.erase(preferredTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
270
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
271 // Flatten an array with the fallback transfer syntaxes
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
272 std::vector<const char*> asFallback;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
273 asFallback.reserve(fallbackSyntaxes.size());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
274 for (std::set<std::string>::const_iterator
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
275 it = fallbackSyntaxes.begin(); it != fallbackSyntaxes.end(); ++it)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
276 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
277 asFallback.push_back(it->c_str());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
278 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
279
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
280 CheckStorageSOPClassesInvariant();
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
281
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
282 switch (mode)
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
283 {
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
284 case Mode_Generic:
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
285 {
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
286 unsigned int presentationContextId = 1;
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
287
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
288 for (std::list<std::string>::const_iterator it = reservedStorageSOPClasses_.begin();
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
289 it != reservedStorageSOPClasses_.end(); ++it)
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
290 {
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
291 RegisterStorageSOPClass(pimpl_->params_, presentationContextId,
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
292 *it, asPreferred, asFallback, remoteAet_);
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
293 }
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
294
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
295 for (std::set<std::string>::const_iterator it = storageSOPClasses_.begin();
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
296 it != storageSOPClasses_.end(); ++it)
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
297 {
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
298 RegisterStorageSOPClass(pimpl_->params_, presentationContextId,
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
299 *it, asPreferred, asFallback, remoteAet_);
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
300 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
302 for (std::set<std::string>::const_iterator it = defaultStorageSOPClasses_.begin();
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
303 it != defaultStorageSOPClasses_.end(); ++it)
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
304 {
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
305 RegisterStorageSOPClass(pimpl_->params_, presentationContextId,
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
306 *it, asPreferred, asFallback, remoteAet_);
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
307 }
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
308
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
309 break;
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
310 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
311
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
312 case Mode_RequestStorageCommitment:
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
313 case Mode_ReportStorageCommitment:
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
314 {
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
315 const char* as = UID_StorageCommitmentPushModelSOPClass;
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
316
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
317 std::vector<const char*> ts;
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
318 ts.push_back(UID_LittleEndianExplicitTransferSyntax);
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
319 ts.push_back(UID_LittleEndianImplicitTransferSyntax);
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
320
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
321 T_ASC_SC_ROLE role;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
322 switch (mode)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
323 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
324 case Mode_RequestStorageCommitment:
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
325 role = ASC_SC_ROLE_DEFAULT;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
326 break;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
327
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
328 case Mode_ReportStorageCommitment:
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
329 role = ASC_SC_ROLE_SCP;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
330 break;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
331
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
332 default:
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
333 throw OrthancException(ErrorCode_InternalError);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
334 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
335
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
336 Check(ASC_addPresentationContext(pimpl_->params_, 1 /*presentationContextId*/,
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
337 as, &ts[0], ts.size(), role),
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
338 remoteAet_, "initializing");
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
339
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
340 break;
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
341 }
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
342
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
343 default:
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
344 throw OrthancException(ErrorCode_InternalError);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
345 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
346 }
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
347
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
348
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
349 static bool IsGenericTransferSyntax(const std::string& syntax)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
350 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
351 return (syntax == UID_LittleEndianExplicitTransferSyntax ||
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
352 syntax == UID_BigEndianExplicitTransferSyntax ||
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
353 syntax == UID_LittleEndianImplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
354 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
355
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
356
3734
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
357 void DicomUserConnection::PImpl::Store(std::string& sopClassUidOut,
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
358 std::string& sopInstanceUidOut,
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
359 DcmInputStream& is,
1907
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
360 DicomUserConnection& connection,
2222
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2202
diff changeset
361 const std::string& moveOriginatorAET,
1997
f9f2aa1cc594 "MoveOriginatorID" can be specified for /modalities/.../store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
362 uint16_t moveOriginatorID)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
363 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
364 DcmFileFormat dcmff;
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
365 Check(dcmff.read(is, EXS_Unknown, EGL_noChange, DCM_MaxReadLength),
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
366 connection.remoteAet_, "C-STORE");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
367
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
368 // Determine the storage SOP class UID for this instance
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
369 OFString sopClassUid;
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
370 if (dcmff.getDataset()->findAndGetOFString(DCM_SOPClassUID, sopClassUid).good())
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
371 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
372 connection.AddStorageSOPClass(sopClassUid.c_str());
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
373 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
374
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
375 // Determine whether a new presentation context must be
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
376 // negotiated, depending on the transfer syntax of this instance
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
377 DcmXfer xfer(dcmff.getDataset()->getOriginalXfer());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
378 const std::string syntax(xfer.getXferID());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
379 bool isGeneric = IsGenericTransferSyntax(syntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
380
2161
7219cdce7bba spelling: negociate -> negotiate
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
381 bool renegotiate;
2580
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
382
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
383 if (!IsOpen())
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
384 {
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
385 renegotiate = true;
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
386 }
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
387 else if (isGeneric)
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
388 {
1684
7dae55228b16 Fix issue 4 (C-Store Association not renegotiated on Specific-to-specific transfer syntax change)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1582
diff changeset
389 // Are we making a generic-to-specific or specific-to-generic change of
7dae55228b16 Fix issue 4 (C-Store Association not renegotiated on Specific-to-specific transfer syntax change)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1582
diff changeset
390 // the transfer syntax? If this is the case, renegotiate the connection.
2161
7219cdce7bba spelling: negociate -> negotiate
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
391 renegotiate = !IsGenericTransferSyntax(connection.GetPreferredTransferSyntax());
2580
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
392
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
393 if (renegotiate)
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
394 {
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
395 LOG(INFO) << "Use of non-generic transfer syntax: the C-Store associated must be renegotiated";
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
396 }
1684
7dae55228b16 Fix issue 4 (C-Store Association not renegotiated on Specific-to-specific transfer syntax change)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1582
diff changeset
397 }
7dae55228b16 Fix issue 4 (C-Store Association not renegotiated on Specific-to-specific transfer syntax change)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1582
diff changeset
398 else
7dae55228b16 Fix issue 4 (C-Store Association not renegotiated on Specific-to-specific transfer syntax change)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1582
diff changeset
399 {
2161
7219cdce7bba spelling: negociate -> negotiate
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
400 // We are using a specific transfer syntax. Renegotiate if the
1684
7dae55228b16 Fix issue 4 (C-Store Association not renegotiated on Specific-to-specific transfer syntax change)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1582
diff changeset
401 // current connection does not match this transfer syntax.
2161
7219cdce7bba spelling: negociate -> negotiate
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
402 renegotiate = (syntax != connection.GetPreferredTransferSyntax());
2580
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
403
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
404 if (renegotiate)
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
405 {
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
406 LOG(INFO) << "Change in the transfer syntax: the C-Store associated must be renegotiated";
055d7d4a823f avoid unecessary openings of DICOM connection for C-Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
407 }
1684
7dae55228b16 Fix issue 4 (C-Store Association not renegotiated on Specific-to-specific transfer syntax change)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1582
diff changeset
408 }
7dae55228b16 Fix issue 4 (C-Store Association not renegotiated on Specific-to-specific transfer syntax change)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1582
diff changeset
409
2161
7219cdce7bba spelling: negociate -> negotiate
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2131
diff changeset
410 if (renegotiate)
1684
7dae55228b16 Fix issue 4 (C-Store Association not renegotiated on Specific-to-specific transfer syntax change)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1582
diff changeset
411 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
412 if (isGeneric)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
413 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
414 connection.ResetPreferredTransferSyntax();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
415 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
416 else
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
417 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
418 connection.SetPreferredTransferSyntax(syntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
419 }
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
420 }
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
421
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
422 if (!connection.IsOpen())
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
423 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
424 connection.Open();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
425 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
426
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
427 // Figure out which SOP class and SOP instance is encapsulated in the file
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
428 DIC_UI sopClass;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
429 DIC_UI sopInstance;
3117
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
430
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
431 #if DCMTK_VERSION_NUMBER >= 364
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
432 if (!DU_findSOPClassAndInstanceInDataSet(dcmff.getDataset(), sopClass, sizeof(sopClass), sopInstance, sizeof(sopInstance)))
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
433 #else
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
434 if (!DU_findSOPClassAndInstanceInDataSet(dcmff.getDataset(), sopClass, sopInstance))
3117
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
435 #endif
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
436 {
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
437 throw OrthancException(ErrorCode_NoSopClassOrInstance,
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
438 "Unable to determine the SOP class/instance for C-STORE with AET " +
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
439 connection.remoteAet_);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
440 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
441
3734
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
442 sopClassUidOut.assign(sopClass);
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
443 sopInstanceUidOut.assign(sopInstance);
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
444
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
445 // Figure out which of the accepted presentation contexts should be used
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
446 int presID = ASC_findAcceptedPresentationContextID(assoc_, sopClass);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
447 if (presID == 0)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
448 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
449 const char *modalityName = dcmSOPClassUIDToModality(sopClass);
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
450 if (modalityName == NULL) modalityName = dcmFindNameOfUID(sopClass);
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
451 if (modalityName == NULL) modalityName = "unknown SOP class";
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
452 throw OrthancException(ErrorCode_NoPresentationContext,
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
453 "Unable to determine the accepted presentation contexts for C-STORE with AET " +
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
454 connection.remoteAet_ + " (" + std::string(modalityName) + ")");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
455 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
456
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
457 // Prepare the transmission of data
1907
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
458 T_DIMSE_C_StoreRQ request;
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
459 memset(&request, 0, sizeof(request));
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
460 request.MessageID = assoc_->nextMsgID++;
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
461 strncpy(request.AffectedSOPClassUID, sopClass, DIC_UI_LEN);
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
462 request.Priority = DIMSE_PRIORITY_MEDIUM;
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
463 request.DataSetType = DIMSE_DATASET_PRESENT;
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
464 strncpy(request.AffectedSOPInstanceUID, sopInstance, DIC_UI_LEN);
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
465
2222
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2202
diff changeset
466 if (!moveOriginatorAET.empty())
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2202
diff changeset
467 {
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2202
diff changeset
468 strncpy(request.MoveOriginatorApplicationEntityTitle,
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2202
diff changeset
469 moveOriginatorAET.c_str(), DIC_AE_LEN);
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2202
diff changeset
470 request.opts = O_STORE_MOVEORIGINATORAETITLE;
1907
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
471
1997
f9f2aa1cc594 "MoveOriginatorID" can be specified for /modalities/.../store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
472 request.MoveOriginatorID = moveOriginatorID; // The type DIC_US is an alias for uint16_t
1907
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
473 request.opts |= O_STORE_MOVEORIGINATORID;
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
474 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
475
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
476 // Finally conduct transmission of data
3700
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
477 T_DIMSE_C_StoreRSP response;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
478 DcmDataset* statusDetail = NULL;
1907
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
479 Check(DIMSE_storeUser(assoc_, presID, &request,
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
480 NULL, dcmff.getDataset(), /*progressCallback*/ NULL, NULL,
3704
58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3700
diff changeset
481 /*opt_blockMode*/ (dimseTimeout_ ? 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: 3700
diff changeset
482 /*opt_dimse_timeout*/ dimseTimeout_,
3700
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
483 &response, &statusDetail, NULL),
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
484 connection.remoteAet_, "C-STORE");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
485
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
486 if (statusDetail != NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
487 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
488 delete statusDetail;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
489 }
3700
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
490
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
491
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
492 /**
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
493 * New in Orthanc 1.6.0: Deal with failures during C-STORE.
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
494 * http://dicom.nema.org/medical/dicom/current/output/chtml/part04/sect_B.2.3.html#table_B.2-1
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
495 **/
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
496
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
497 if (response.DimseStatus != 0x0000 && // Success
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
498 response.DimseStatus != 0xB000 && // Warning - Coercion of Data Elements
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
499 response.DimseStatus != 0xB007 && // Warning - Data Set does not match SOP Class
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
500 response.DimseStatus != 0xB006) // Warning - Elements Discarded
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
501 {
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
502 char buf[16];
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
503 sprintf(buf, "%04X", response.DimseStatus);
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
504 throw OrthancException(ErrorCode_NetworkProtocol,
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
505 "C-STORE SCU to AET \"" + connection.remoteAet_ +
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
506 "\" has failed with DIMSE status 0x" + buf);
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
507 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
508 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
509
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
510
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
511 namespace
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
512 {
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
513 struct FindPayload
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
514 {
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
515 DicomFindAnswers* answers;
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
516 const char* level;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
517 bool isWorklist;
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
518 };
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
519 }
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
520
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
521
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
522 static void FindCallback(
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
523 /* in */
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
524 void *callbackData,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
525 T_DIMSE_C_FindRQ *request, /* original find request */
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
526 int responseCount,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
527 T_DIMSE_C_FindRSP *response, /* pending response received */
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
528 DcmDataset *responseIdentifiers /* pending response identifiers */
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
529 )
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
530 {
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
531 FindPayload& payload = *reinterpret_cast<FindPayload*>(callbackData);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
532
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
533 if (responseIdentifiers != NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
534 {
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
535 if (payload.isWorklist)
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
536 {
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
537 ParsedDicomFile answer(*responseIdentifiers);
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
538 payload.answers->Add(answer);
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
539 }
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
540 else
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
541 {
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
542 DicomMap m;
2381
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2352
diff changeset
543 FromDcmtkBridge::ExtractDicomSummary(m, *responseIdentifiers);
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2352
diff changeset
544
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
545 if (!m.HasTag(DICOM_TAG_QUERY_RETRIEVE_LEVEL))
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
546 {
2007
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2006
diff changeset
547 m.SetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL, payload.level, false);
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
548 }
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
549
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
550 payload.answers->Add(m);
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
551 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
552 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
553 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
554
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
555
3370
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
556 static void NormalizeFindQuery(DicomMap& fixedQuery,
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
557 ResourceType level,
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
558 const DicomMap& fields)
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
559 {
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
560 std::set<DicomTag> allowedTags;
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
561
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
562 // WARNING: Do not add "break" or reorder items in this switch-case!
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
563 switch (level)
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
564 {
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
565 case ResourceType_Instance:
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
566 DicomTag::AddTagsForModule(allowedTags, DicomModule_Instance);
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
567
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
568 case ResourceType_Series:
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
569 DicomTag::AddTagsForModule(allowedTags, DicomModule_Series);
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
570
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
571 case ResourceType_Study:
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
572 DicomTag::AddTagsForModule(allowedTags, DicomModule_Study);
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
573
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
574 case ResourceType_Patient:
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
575 DicomTag::AddTagsForModule(allowedTags, DicomModule_Patient);
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
576 break;
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
577
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
578 default:
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
579 throw OrthancException(ErrorCode_InternalError);
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
580 }
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
581
2005
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
582 switch (level)
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
583 {
2005
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
584 case ResourceType_Patient:
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
585 allowedTags.insert(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES);
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
586 allowedTags.insert(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES);
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
587 allowedTags.insert(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES);
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
588 break;
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
589
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
590 case ResourceType_Study:
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
591 allowedTags.insert(DICOM_TAG_MODALITIES_IN_STUDY);
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
592 allowedTags.insert(DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES);
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
593 allowedTags.insert(DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES);
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
594 allowedTags.insert(DICOM_TAG_SOP_CLASSES_IN_STUDY);
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
595 break;
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
596
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
597 case ResourceType_Series:
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
598 allowedTags.insert(DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES);
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
599 break;
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
600
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
601 default:
9e021b2b348b Support of optional tags for counting resources in C-Find SCU
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1998
diff changeset
602 break;
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
603 }
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
604
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
605 allowedTags.insert(DICOM_TAG_SPECIFIC_CHARACTER_SET);
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
606
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
607 DicomArray query(fields);
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
608 for (size_t i = 0; i < query.GetSize(); i++)
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
609 {
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
610 const DicomTag& tag = query.GetElement(i).GetTag();
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
611 if (allowedTags.find(tag) == allowedTags.end())
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
612 {
1707
9a04ad916831 more tolerant c-find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1684
diff changeset
613 LOG(WARNING) << "Tag not allowed for this C-Find level, will be ignored: " << tag;
9a04ad916831 more tolerant c-find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1684
diff changeset
614 }
9a04ad916831 more tolerant c-find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1684
diff changeset
615 else
9a04ad916831 more tolerant c-find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1684
diff changeset
616 {
9a04ad916831 more tolerant c-find scp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1684
diff changeset
617 fixedQuery.SetValue(tag, query.GetElement(i).GetValue());
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
618 }
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
619 }
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
620 }
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
621
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
622
2202
9b373b7d6713 Fix handling of encodings in C-FIND requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2161
diff changeset
623 static ParsedDicomFile* ConvertQueryFields(const DicomMap& fields,
9b373b7d6713 Fix handling of encodings in C-FIND requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2161
diff changeset
624 ModalityManufacturer manufacturer)
1429
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
625 {
2335
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
626 // Fix outgoing C-Find requests issue for Syngo.Via and its
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
627 // solution was reported by Emsy Chan by private mail on
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
628 // 2015-06-17. According to Robert van Ommen (2015-11-30), the
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
629 // same fix is required for Agfa Impax. This was generalized for
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
630 // generic manufacturer since it seems to affect PhilipsADW,
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
631 // GEWAServer as well:
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
632 // https://bitbucket.org/sjodogne/orthanc/issues/31/
2319
ae6245053bcf made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
amazy
parents: 2244
diff changeset
633
1429
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
634 switch (manufacturer)
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
635 {
2319
ae6245053bcf made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
amazy
parents: 2244
diff changeset
636 case ModalityManufacturer_GenericNoWildcardInDates:
2352
3ab96768d144 Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2340
diff changeset
637 case ModalityManufacturer_GenericNoUniversalWildcard:
1429
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
638 {
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3704
diff changeset
639 std::unique_ptr<DicomMap> fix(fields.Clone());
1429
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
640
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
641 std::set<DicomTag> tags;
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
642 fix->GetTags(tags);
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
643
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
644 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it)
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
645 {
2335
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
646 // Replace a "*" wildcard query by an empty query ("") for
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
647 // "date" or "all" value representations depending on the
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
648 // type of manufacturer.
2352
3ab96768d144 Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2340
diff changeset
649 if (manufacturer == ModalityManufacturer_GenericNoUniversalWildcard ||
2335
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
650 (manufacturer == ModalityManufacturer_GenericNoWildcardInDates &&
174c3616ab6d code review
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2319
diff changeset
651 FromDcmtkBridge::LookupValueRepresentation(*it) == ValueRepresentation_Date))
1429
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
652 {
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
653 const DicomValue* value = fix->TestAndGetValue(*it);
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
654
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
655 if (value != NULL &&
1737
ec66a16aa398 removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1707
diff changeset
656 !value->IsNull() &&
ec66a16aa398 removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1707
diff changeset
657 value->GetContent() == "*")
1429
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
658 {
2007
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2006
diff changeset
659 fix->SetValue(*it, "", false);
1429
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
660 }
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
661 }
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
662 }
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
663
3342
63f59ad9381a Fix issue #136 (C-Find request fails when found DICOM file does not have certain tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3215
diff changeset
664 return new ParsedDicomFile(*fix, GetDefaultDicomEncoding(), false /* be strict */);
1429
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
665 }
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
666
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
667 default:
3342
63f59ad9381a Fix issue #136 (C-Find request fails when found DICOM file does not have certain tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3215
diff changeset
668 return new ParsedDicomFile(fields, GetDefaultDicomEncoding(), false /* be strict */);
1429
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
669 }
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
670 }
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
671
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
672
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
673 static void ExecuteFind(DicomFindAnswers& answers,
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
674 T_ASC_Association* association,
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
675 DcmDataset* dataset,
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
676 const char* sopClass,
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
677 bool isWorklist,
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
678 const char* level,
3208
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
679 uint32_t dimseTimeout,
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
680 const std::string& remoteAet)
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
681 {
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
682 assert(isWorklist ^ (level != NULL));
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
683
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
684 FindPayload payload;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
685 payload.answers = &answers;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
686 payload.level = level;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
687 payload.isWorklist = isWorklist;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
688
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
689 // Figure out which of the accepted presentation contexts should be used
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
690 int presID = ASC_findAcceptedPresentationContextID(association, sopClass);
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
691 if (presID == 0)
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
692 {
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
693 throw OrthancException(ErrorCode_DicomFindUnavailable,
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
694 "Remote AET is " + remoteAet);
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
695 }
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
696
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
697 T_DIMSE_C_FindRQ request;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
698 memset(&request, 0, sizeof(request));
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
699 request.MessageID = association->nextMsgID++;
1907
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
700 strncpy(request.AffectedSOPClassUID, sopClass, DIC_UI_LEN);
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
701 request.Priority = DIMSE_PRIORITY_MEDIUM;
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
702 request.DataSetType = DIMSE_DATASET_PRESENT;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
703
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
704 T_DIMSE_C_FindRSP response;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
705 DcmDataset* statusDetail = NULL;
3117
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
706
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
707 #if DCMTK_VERSION_NUMBER >= 364
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
708 int responseCount;
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
709 #endif
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
710
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
711 OFCondition cond = DIMSE_findUser(association, presID, &request, dataset,
3117
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
712 #if DCMTK_VERSION_NUMBER >= 364
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
713 responseCount,
c8b75e207a82 working on dcmtk 3.6.4 compatibility
jodogne
parents: 3060
diff changeset
714 #endif
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
715 FindCallback, &payload,
3704
58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3700
diff changeset
716 /*opt_blockMode*/ (dimseTimeout ? DIMSE_NONBLOCKING : DIMSE_BLOCKING),
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
717 /*opt_dimse_timeout*/ dimseTimeout,
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
718 &response, &statusDetail);
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
719
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
720 if (statusDetail)
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
721 {
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
722 delete statusDetail;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
723 }
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
724
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
725 Check(cond, remoteAet, "C-FIND");
3700
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
726
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
727
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
728 /**
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
729 * New in Orthanc 1.6.0: Deal with failures during C-FIND.
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
730 * http://dicom.nema.org/medical/dicom/current/output/chtml/part04/sect_C.4.html#table_C.4-1
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
731 **/
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
732
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
733 if (response.DimseStatus != 0x0000 && // Success
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
734 response.DimseStatus != 0xFF00 && // Pending - Matches are continuing
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
735 response.DimseStatus != 0xFF01) // Pending - Matches are continuing
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
736 {
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
737 char buf[16];
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
738 sprintf(buf, "%04X", response.DimseStatus);
3800
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
739
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
740 if (response.DimseStatus == STATUS_FIND_Failed_UnableToProcess)
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
741 {
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
742 throw OrthancException(ErrorCode_NetworkProtocol,
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
743 HttpStatus_422_UnprocessableEntity,
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
744 "C-FIND SCU to AET \"" + remoteAet +
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
745 "\" has failed with DIMSE status 0x" + buf +
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
746 " (unable to process - invalid query ?)"
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
747 );
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
748 }
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
749 else
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
750 {
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
751 throw OrthancException(ErrorCode_NetworkProtocol,
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
752 "C-FIND SCU to AET \"" + remoteAet +
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
753 "\" has failed with DIMSE status 0x" + buf);
38b0f51781aa improved error message when trying to execute a C-Find query that is not accepted by the remote modality
Alain Mazy <alain@mazy.be>
parents: 3799
diff changeset
754 }
3700
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
755 }
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
756
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
757 }
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
758
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
759
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
760 void DicomUserConnection::Find(DicomFindAnswers& result,
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
761 ResourceType level,
3370
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
762 const DicomMap& originalFields,
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
763 bool normalize)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
764 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
765 CheckIsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
766
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3704
diff changeset
767 std::unique_ptr<ParsedDicomFile> query;
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
768
3370
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
769 if (normalize)
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
770 {
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
771 DicomMap fields;
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
772 NormalizeFindQuery(fields, level, originalFields);
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
773 query.reset(ConvertQueryFields(fields, manufacturer_));
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
774 }
872bd3b6ec72 "/modalities/{id}/query": New argument "Normalize"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3369
diff changeset
775 else
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
776 {
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
777 query.reset(new ParsedDicomFile(originalFields,
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
778 GetDefaultDicomEncoding(),
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
779 false /* be strict */));
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
780 }
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
781
2202
9b373b7d6713 Fix handling of encodings in C-FIND requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2161
diff changeset
782 DcmDataset* dataset = query->GetDcmtkObject().getDataset();
9b373b7d6713 Fix handling of encodings in C-FIND requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2161
diff changeset
783
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
784 const char* clevel = NULL;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
785 const char* sopClass = NULL;
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
786
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
787 switch (level)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
788 {
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
789 case ResourceType_Patient:
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
790 clevel = "PATIENT";
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
791 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "PATIENT");
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
792 sopClass = UID_FINDPatientRootQueryRetrieveInformationModel;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
793 break;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
794
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
795 case ResourceType_Study:
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
796 clevel = "STUDY";
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
797 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "STUDY");
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
798 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
799 break;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
800
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
801 case ResourceType_Series:
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
802 clevel = "SERIES";
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
803 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "SERIES");
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
804 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
805 break;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
806
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
807 case ResourceType_Instance:
3561
bdafff1ce443 C-Find SCU at Instance level now sets the 0008,0052 tag to IMAGE per default (was INSTANCE). Source: https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/orthanc-users/FYxHXzlaQ0M/rn6d0SowAAAJ
Alain Mazy <alain@mazy.be>
parents: 3402
diff changeset
808 clevel = "IMAGE";
bdafff1ce443 C-Find SCU at Instance level now sets the 0008,0052 tag to IMAGE per default (was INSTANCE). Source: https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/orthanc-users/FYxHXzlaQ0M/rn6d0SowAAAJ
Alain Mazy <alain@mazy.be>
parents: 3402
diff changeset
809 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "IMAGE");
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
810 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel;
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
811 break;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
812
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
813 default:
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
814 throw OrthancException(ErrorCode_ParameterOutOfRange);
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
815 }
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
816
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
817
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
818 const char* universal;
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
819 if (manufacturer_ == ModalityManufacturer_GE)
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
820 {
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
821 universal = "*";
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
822 }
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
823 else
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
824 {
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
825 universal = "";
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
826 }
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
827
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
828
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
829 // Add the expected tags for this query level.
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
830 // WARNING: Do not reorder or add "break" in this switch-case!
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
831 switch (level)
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
832 {
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
833 case ResourceType_Instance:
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
834 if (!dataset->tagExists(DCM_SOPInstanceUID))
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
835 {
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
836 DU_putStringDOElement(dataset, DCM_SOPInstanceUID, universal);
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
837 }
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
838
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
839 case ResourceType_Series:
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
840 if (!dataset->tagExists(DCM_SeriesInstanceUID))
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
841 {
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
842 DU_putStringDOElement(dataset, DCM_SeriesInstanceUID, universal);
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
843 }
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
844
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
845 case ResourceType_Study:
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
846 if (!dataset->tagExists(DCM_AccessionNumber))
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
847 {
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
848 DU_putStringDOElement(dataset, DCM_AccessionNumber, universal);
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
849 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
850
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
851 if (!dataset->tagExists(DCM_StudyInstanceUID))
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
852 {
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
853 DU_putStringDOElement(dataset, DCM_StudyInstanceUID, universal);
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
854 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
855
1368
b22ba8c5edbe query retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1366
diff changeset
856 case ResourceType_Patient:
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
857 if (!dataset->tagExists(DCM_PatientID))
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
858 {
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
859 DU_putStringDOElement(dataset, DCM_PatientID, universal);
2888
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
860 }
61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2715
diff changeset
861
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
862 break;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
863
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
864 default:
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
865 throw OrthancException(ErrorCode_ParameterOutOfRange);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
866 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
867
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
868 assert(clevel != NULL && sopClass != NULL);
3208
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
869 ExecuteFind(result, pimpl_->assoc_, dataset, sopClass, false, clevel,
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
870 pimpl_->dimseTimeout_, remoteAet_);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
871 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
872
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
873
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
874 void DicomUserConnection::MoveInternal(const std::string& targetAet,
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
875 ResourceType level,
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
876 const DicomMap& fields)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
877 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
878 CheckIsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
879
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3704
diff changeset
880 std::unique_ptr<ParsedDicomFile> query(ConvertQueryFields(fields, manufacturer_));
2202
9b373b7d6713 Fix handling of encodings in C-FIND requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2161
diff changeset
881 DcmDataset* dataset = query->GetDcmtkObject().getDataset();
1429
7366a0bdda6a attempt of fix for Syngo.Via
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1427
diff changeset
882
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
883 const char* sopClass = UID_MOVEStudyRootQueryRetrieveInformationModel;
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
884 switch (level)
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
885 {
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
886 case ResourceType_Patient:
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
887 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "PATIENT");
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
888 break;
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
889
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
890 case ResourceType_Study:
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
891 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "STUDY");
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
892 break;
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
893
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
894 case ResourceType_Series:
3369
20b38a533254 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3342
diff changeset
895 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "SERIES");
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
896 break;
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
897
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
898 case ResourceType_Instance:
3561
bdafff1ce443 C-Find SCU at Instance level now sets the 0008,0052 tag to IMAGE per default (was INSTANCE). Source: https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/orthanc-users/FYxHXzlaQ0M/rn6d0SowAAAJ
Alain Mazy <alain@mazy.be>
parents: 3402
diff changeset
899 DU_putStringDOElement(dataset, DCM_QueryRetrieveLevel, "IMAGE");
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
900 break;
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
901
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
902 default:
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
903 throw OrthancException(ErrorCode_ParameterOutOfRange);
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
904 }
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
905
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
906 // Figure out which of the accepted presentation contexts should be used
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
907 int presID = ASC_findAcceptedPresentationContextID(pimpl_->assoc_, sopClass);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
908 if (presID == 0)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
909 {
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
910 throw OrthancException(ErrorCode_DicomMoveUnavailable,
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
911 "Remote AET is " + remoteAet_);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
912 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
913
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
914 T_DIMSE_C_MoveRQ request;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
915 memset(&request, 0, sizeof(request));
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
916 request.MessageID = pimpl_->assoc_->nextMsgID++;
1907
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
917 strncpy(request.AffectedSOPClassUID, sopClass, DIC_UI_LEN);
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
918 request.Priority = DIMSE_PRIORITY_MEDIUM;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
919 request.DataSetType = DIMSE_DATASET_PRESENT;
1907
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
920 strncpy(request.MoveDestination, targetAet.c_str(), DIC_AE_LEN);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
921
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
922 T_DIMSE_C_MoveRSP response;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
923 DcmDataset* statusDetail = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
924 DcmDataset* responseIdentifiers = NULL;
2202
9b373b7d6713 Fix handling of encodings in C-FIND requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2161
diff changeset
925 OFCondition cond = DIMSE_moveUser(pimpl_->assoc_, presID, &request, dataset,
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
926 NULL, NULL,
3704
58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3700
diff changeset
927 /*opt_blockMode*/ (pimpl_->dimseTimeout_ ? DIMSE_NONBLOCKING : DIMSE_BLOCKING),
1186
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
928 /*opt_dimse_timeout*/ pimpl_->dimseTimeout_,
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
929 pimpl_->net_, NULL, NULL,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
930 &response, &statusDetail, &responseIdentifiers);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
931
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
932 if (statusDetail)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
933 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
934 delete statusDetail;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
935 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
936
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
937 if (responseIdentifiers)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
938 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
939 delete responseIdentifiers;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
940 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
941
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
942 Check(cond, remoteAet_, "C-MOVE");
3700
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
943
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
944
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
945 /**
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
946 * New in Orthanc 1.6.0: Deal with failures during C-MOVE.
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
947 * http://dicom.nema.org/medical/dicom/current/output/chtml/part04/sect_C.4.2.html#table_C.4-2
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
948 **/
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
949
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
950 if (response.DimseStatus != 0x0000 && // Success
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
951 response.DimseStatus != 0xFF00) // Pending - Sub-operations are continuing
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
952 {
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
953 char buf[16];
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
954 sprintf(buf, "%04X", response.DimseStatus);
3798
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
955
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
956 if (response.DimseStatus == STATUS_MOVE_Failed_UnableToProcess)
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
957 {
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
958 throw OrthancException(ErrorCode_NetworkProtocol,
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
959 HttpStatus_422_UnprocessableEntity,
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
960 "C-MOVE SCU to AET \"" + remoteAet_ +
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
961 "\" has failed with DIMSE status 0x" + buf +
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
962 " (unable to process - resource not found ?)"
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
963 );
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
964 }
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
965 else
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
966 {
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
967 throw OrthancException(ErrorCode_NetworkProtocol,
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
968 "C-MOVE SCU to AET \"" + remoteAet_ +
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
969 "\" has failed with DIMSE status 0x" + buf);
c38b82bb6fd3 improved error message when trying to C-Move a resource that is not found
Alain Mazy <alain@mazy.be>
parents: 3712
diff changeset
970 }
3700
5cbbf14e516b Fix issue #103 ("queries/.../retrieve" API returns HTTP code 200 even on server errors)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
971 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
972 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
973
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
974
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
975 void DicomUserConnection::ResetStorageSOPClasses()
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
976 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
977 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
978
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
979 storageSOPClasses_.clear();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
980 defaultStorageSOPClasses_.clear();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
981
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
982 // Copy the short list of storage SOP classes from DCMTK, making
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
983 // room for the 5 SOP classes reserved for C-ECHO, C-FIND, C-MOVE at (**).
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
984
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
985 std::set<std::string> uncommon;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
986 uncommon.insert(UID_BlendingSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
987 uncommon.insert(UID_GrayscaleSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
988 uncommon.insert(UID_ColorSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
989 uncommon.insert(UID_PseudoColorSoftcopyPresentationStateStorage);
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
990 uncommon.insert(UID_XAXRFGrayscaleSoftcopyPresentationStateStorage);
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
991
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
992 // Add the storage syntaxes for C-STORE
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
993 for (int i = 0; i < numberOfDcmShortSCUStorageSOPClassUIDs - 1; i++)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
994 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
995 if (uncommon.find(dcmShortSCUStorageSOPClassUIDs[i]) == uncommon.end())
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
996 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
997 defaultStorageSOPClasses_.insert(dcmShortSCUStorageSOPClassUIDs[i]);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
998 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
999 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1000
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1001 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1002 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1003
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1004
2587
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1005 void DicomUserConnection::DefaultSetup()
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1006 {
2587
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1007 preferredTransferSyntax_ = DEFAULT_PREFERRED_TRANSFER_SYNTAX;
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1008 localAet_ = "STORESCU";
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1009 remoteAet_ = "ANY-SCP";
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1010 remoteHost_ = "127.0.0.1";
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1011 remotePort_ = 104;
519
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
1012 manufacturer_ = ModalityManufacturer_Generic;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1013
2069
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1014 SetTimeout(defaultTimeout_);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1015 pimpl_->net_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1016 pimpl_->params_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1017 pimpl_->assoc_ = NULL;
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1018
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1019 // SOP classes for C-ECHO, C-FIND and C-MOVE (**)
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1020 reservedStorageSOPClasses_.push_back(UID_VerificationSOPClass);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1021 reservedStorageSOPClasses_.push_back(UID_FINDPatientRootQueryRetrieveInformationModel);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1022 reservedStorageSOPClasses_.push_back(UID_FINDStudyRootQueryRetrieveInformationModel);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1023 reservedStorageSOPClasses_.push_back(UID_MOVEStudyRootQueryRetrieveInformationModel);
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1024 reservedStorageSOPClasses_.push_back(UID_FINDModalityWorklistInformationModel);
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1025
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1026 ResetStorageSOPClasses();
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1027 }
2587
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1028
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1029
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1030 DicomUserConnection::DicomUserConnection() :
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1031 pimpl_(new PImpl)
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1032 {
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1033 DefaultSetup();
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1034 }
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1035
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1036
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1037 DicomUserConnection::DicomUserConnection(const std::string& localAet,
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1038 const RemoteModalityParameters& remote) :
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1039 pimpl_(new PImpl)
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1040 {
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1041 DefaultSetup();
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1042 SetLocalApplicationEntityTitle(localAet);
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1043 SetRemoteModality(remote);
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1044 }
bf14b037731f new constructor for DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2580
diff changeset
1045
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1046
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1047 DicomUserConnection::~DicomUserConnection()
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1048 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1049 Close();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1050 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1051
772
31cc399c7762 RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1052
1427
d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1371
diff changeset
1053 void DicomUserConnection::SetRemoteModality(const RemoteModalityParameters& parameters)
772
31cc399c7762 RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1054 {
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1055 SetRemoteApplicationEntityTitle(parameters.GetApplicationEntityTitle());
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1056 SetRemoteHost(parameters.GetHost());
2715
73bc0c32547c fix embedding openssl within a DLL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2601
diff changeset
1057 SetRemotePort(parameters.GetPortNumber());
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1058 SetRemoteManufacturer(parameters.GetManufacturer());
772
31cc399c7762 RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1059 }
31cc399c7762 RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1060
31cc399c7762 RemoteModalityParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1061
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1062 void DicomUserConnection::SetLocalApplicationEntityTitle(const std::string& aet)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1063 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1064 if (localAet_ != aet)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1065 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1066 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1067 localAet_ = aet;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1068 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1069 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1070
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1071 void DicomUserConnection::SetRemoteApplicationEntityTitle(const std::string& aet)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1072 {
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1073 if (remoteAet_ != aet)
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1074 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1075 Close();
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1076 remoteAet_ = aet;
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1077 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1078 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1079
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1080 void DicomUserConnection::SetRemoteManufacturer(ModalityManufacturer manufacturer)
519
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
1081 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1082 if (manufacturer_ != manufacturer)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1083 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1084 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1085 manufacturer_ = manufacturer;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1086 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1087 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1088
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1089 void DicomUserConnection::ResetPreferredTransferSyntax()
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1090 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1091 SetPreferredTransferSyntax(DEFAULT_PREFERRED_TRANSFER_SYNTAX);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1092 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1093
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1094 void DicomUserConnection::SetPreferredTransferSyntax(const std::string& preferredTransferSyntax)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1095 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1096 if (preferredTransferSyntax_ != preferredTransferSyntax)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1097 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1098 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1099 preferredTransferSyntax_ = preferredTransferSyntax;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1100 }
519
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
1101 }
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
1102
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1103
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1104 void DicomUserConnection::SetRemoteHost(const std::string& host)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1105 {
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1106 if (remoteHost_ != host)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1107 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1108 if (host.size() > HOST_NAME_MAX - 10)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1109 {
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1110 throw OrthancException(ErrorCode_ParameterOutOfRange,
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1111 "Invalid host name (too long): " + host);
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1112 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1113
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1114 Close();
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1115 remoteHost_ = host;
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1116 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1117 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1118
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1119 void DicomUserConnection::SetRemotePort(uint16_t port)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1120 {
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1121 if (remotePort_ != port)
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1122 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1123 Close();
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1124 remotePort_ = port;
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1125 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1126 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1127
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1128 void DicomUserConnection::OpenInternal(Mode mode)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1129 {
662
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1130 if (IsOpen())
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1131 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1132 // Don't reopen the connection
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1133 return;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 657
diff changeset
1134 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1135
769
3f946e5c3802 ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
1136 LOG(INFO) << "Opening a DICOM SCU connection from AET \"" << GetLocalApplicationEntityTitle()
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1137 << "\" to AET \"" << GetRemoteApplicationEntityTitle() << "\" on host "
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1138 << GetRemoteHost() << ":" << GetRemotePort()
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1139 << " (manufacturer: " << EnumerationToString(GetRemoteManufacturer()) << ")";
769
3f946e5c3802 ReusableDicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
1140
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1141 Check(ASC_initializeNetwork(NET_REQUESTOR, 0, /*opt_acse_timeout*/ pimpl_->acseTimeout_, &pimpl_->net_), remoteAet_, "connecting");
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1142 Check(ASC_createAssociationParameters(&pimpl_->params_, /*opt_maxReceivePDULength*/ ASC_DEFAULTMAXPDU), remoteAet_, "connecting");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1143
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1144 // Set this application's title and the called application's title in the params
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1145 Check(ASC_setAPTitles(pimpl_->params_, localAet_.c_str(), remoteAet_.c_str(), NULL),
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1146 remoteAet_, "connecting");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1147
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1148 // Set the network addresses of the local and remote entities
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1149 char localHost[HOST_NAME_MAX];
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1150 gethostname(localHost, HOST_NAME_MAX - 1);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1151
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1152 char remoteHostAndPort[HOST_NAME_MAX];
2
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
1153
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
1154 #ifdef _MSC_VER
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1155 _snprintf
2
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
1156 #else
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1157 snprintf
2
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
1158 #endif
1285
5730f374e4e6 Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1186
diff changeset
1159 (remoteHostAndPort, HOST_NAME_MAX - 1, "%s:%d", remoteHost_.c_str(), remotePort_);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1160
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1161 Check(ASC_setPresentationAddresses(pimpl_->params_, localHost, remoteHostAndPort),
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1162 remoteAet_, "connecting");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1163
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1164 // Set various options
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1165 Check(ASC_setTransportLayerType(pimpl_->params_, /*opt_secureConnection*/ false),
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1166 remoteAet_, "connecting");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1167
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1168 SetupPresentationContexts(mode, preferredTransferSyntax_);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1169
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1170 // Do the association
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1171 Check(ASC_requestAssociation(pimpl_->net_, pimpl_->params_, &pimpl_->assoc_),
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1172 remoteAet_, "connecting");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1173
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1174 if (ASC_countAcceptedPresentationContexts(pimpl_->params_) == 0)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1175 {
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1176 throw OrthancException(ErrorCode_NoPresentationContext,
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1177 "Unable to negotiate a presentation context with AET " +
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1178 remoteAet_);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1179 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1180 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1181
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1182 void DicomUserConnection::Close()
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1183 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1184 if (pimpl_->assoc_ != NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1185 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1186 ASC_releaseAssociation(pimpl_->assoc_);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1187 ASC_destroyAssociation(&pimpl_->assoc_);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1188 pimpl_->assoc_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1189 pimpl_->params_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1190 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1191 else
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1192 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1193 if (pimpl_->params_ != NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1194 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1195 ASC_destroyAssociationParameters(&pimpl_->params_);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1196 pimpl_->params_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1197 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1198 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1199
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1200 if (pimpl_->net_ != NULL)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1201 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1202 ASC_dropNetwork(&pimpl_->net_);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1203 pimpl_->net_ = NULL;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1204 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1205 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1206
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1207 bool DicomUserConnection::IsOpen() const
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1208 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1209 return pimpl_->IsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1210 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1211
3734
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1212 void DicomUserConnection::Store(std::string& sopClassUid /* out */,
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1213 std::string& sopInstanceUid /* out */,
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1214 const char* buffer,
1907
5011a597b6ce Support of Move Originator Message ID (0000,1031) in C-Store responses driven by C-Move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
1215 size_t size,
2222
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2202
diff changeset
1216 const std::string& moveOriginatorAET,
1997
f9f2aa1cc594 "MoveOriginatorID" can be specified for /modalities/.../store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
1217 uint16_t moveOriginatorID)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1218 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1219 // Prepare an input stream for the memory buffer
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1220 DcmInputBufferStream is;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1221 if (size > 0)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1222 is.setBuffer(buffer, size);
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1223 is.setEos();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1224
3734
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1225 pimpl_->Store(sopClassUid, sopInstanceUid, is, *this, moveOriginatorAET, moveOriginatorID);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1226 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1227
3734
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1228 void DicomUserConnection::Store(std::string& sopClassUid /* out */,
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1229 std::string& sopInstanceUid /* out */,
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1230 const std::string& buffer,
2222
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2202
diff changeset
1231 const std::string& moveOriginatorAET,
1997
f9f2aa1cc594 "MoveOriginatorID" can be specified for /modalities/.../store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
1232 uint16_t moveOriginatorID)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1233 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1234 if (buffer.size() > 0)
3734
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1235 Store(sopClassUid, sopInstanceUid, &buffer[0], buffer.size(),
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1236 moveOriginatorAET, moveOriginatorID);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1237 else
3734
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1238 Store(sopClassUid, sopInstanceUid, NULL, 0, moveOriginatorAET, moveOriginatorID);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1239 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1240
3734
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1241 void DicomUserConnection::StoreFile(std::string& sopClassUid /* out */,
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1242 std::string& sopInstanceUid /* out */,
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1243 const std::string& path,
2222
21713ce8717b Fix handling of Move Originator AET and ID in C-MOVE SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2202
diff changeset
1244 const std::string& moveOriginatorAET,
1997
f9f2aa1cc594 "MoveOriginatorID" can be specified for /modalities/.../store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1929
diff changeset
1245 uint16_t moveOriginatorID)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1246 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1247 // Prepare an input stream for the file
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1248 DcmInputFileStream is(path.c_str());
3734
4fc24b69446a triggering storage commitment scu from REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3713
diff changeset
1249 pimpl_->Store(sopClassUid, sopInstanceUid, is, *this, moveOriginatorAET, moveOriginatorID);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1250 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1251
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1252 bool DicomUserConnection::Echo()
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1253 {
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1254 CheckIsOpen();
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1255 DIC_US status;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1256 Check(DIMSE_echoUser(pimpl_->assoc_, pimpl_->assoc_->nextMsgID++,
3704
58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3700
diff changeset
1257 /*opt_blockMode*/ (pimpl_->dimseTimeout_ ? DIMSE_NONBLOCKING : DIMSE_BLOCKING),
1186
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1258 /*opt_dimse_timeout*/ pimpl_->dimseTimeout_,
3215
4924972bce77 more verbose errors in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3208
diff changeset
1259 &status, NULL), remoteAet_, "C-ECHO");
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1260 return status == STATUS_Success;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1261 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1262
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1263
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1264 static void TestAndCopyTag(DicomMap& result,
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1265 const DicomMap& source,
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1266 const DicomTag& tag)
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1267 {
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1268 if (!source.HasTag(tag))
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1269 {
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1270 throw OrthancException(ErrorCode_BadRequest);
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1271 }
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1272 else
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1273 {
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1274 result.SetValue(tag, source.GetValue(tag));
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1275 }
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1276 }
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1277
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1278
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1279 void DicomUserConnection::Move(const std::string& targetAet,
1998
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1280 ResourceType level,
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1281 const DicomMap& findResult)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1282 {
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1283 DicomMap move;
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1284 switch (level)
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1285 {
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1286 case ResourceType_Patient:
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1287 TestAndCopyTag(move, findResult, DICOM_TAG_PATIENT_ID);
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1288 break;
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1289
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1290 case ResourceType_Study:
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1291 TestAndCopyTag(move, findResult, DICOM_TAG_STUDY_INSTANCE_UID);
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1292 break;
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1293
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1294 case ResourceType_Series:
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1295 TestAndCopyTag(move, findResult, DICOM_TAG_STUDY_INSTANCE_UID);
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1296 TestAndCopyTag(move, findResult, DICOM_TAG_SERIES_INSTANCE_UID);
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1297 break;
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1298
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1299 case ResourceType_Instance:
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1300 TestAndCopyTag(move, findResult, DICOM_TAG_STUDY_INSTANCE_UID);
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1301 TestAndCopyTag(move, findResult, DICOM_TAG_SERIES_INSTANCE_UID);
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1302 TestAndCopyTag(move, findResult, DICOM_TAG_SOP_INSTANCE_UID);
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1303 break;
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1304
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1305 default:
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1306 throw OrthancException(ErrorCode_InternalError);
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1307 }
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1308
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
1309 MoveInternal(targetAet, level, move);
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1310 }
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1311
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1312
1998
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1313 void DicomUserConnection::Move(const std::string& targetAet,
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1314 const DicomMap& findResult)
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1315 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1316 if (!findResult.HasTag(DICOM_TAG_QUERY_RETRIEVE_LEVEL))
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1317 {
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1318 throw OrthancException(ErrorCode_InternalError);
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1319 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1320
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1321 const std::string tmp = findResult.GetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL).GetContent();
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1322 ResourceType level = StringToResourceType(tmp.c_str());
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1323
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1324 Move(targetAet, level, findResult);
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1325 }
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1326
9b61701c35f2 New URI "/modalities/.../move" to issue C-Move SCU requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1997
diff changeset
1327
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1328 void DicomUserConnection::MovePatient(const std::string& targetAet,
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1329 const std::string& patientId)
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1330 {
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1331 DicomMap query;
2007
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2006
diff changeset
1332 query.SetValue(DICOM_TAG_PATIENT_ID, patientId, false);
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
1333 MoveInternal(targetAet, ResourceType_Patient, query);
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1334 }
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1335
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1336 void DicomUserConnection::MoveStudy(const std::string& targetAet,
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1337 const std::string& studyUid)
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1338 {
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1339 DicomMap query;
2007
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2006
diff changeset
1340 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid, false);
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
1341 MoveInternal(targetAet, ResourceType_Study, query);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1342 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1343
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1344 void DicomUserConnection::MoveSeries(const std::string& targetAet,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1345 const std::string& studyUid,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1346 const std::string& seriesUid)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1347 {
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1348 DicomMap query;
2007
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2006
diff changeset
1349 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid, false);
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2006
diff changeset
1350 query.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid, false);
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
1351 MoveInternal(targetAet, ResourceType_Series, query);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1352 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1353
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1354 void DicomUserConnection::MoveInstance(const std::string& targetAet,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1355 const std::string& studyUid,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1356 const std::string& seriesUid,
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1357 const std::string& instanceUid)
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1358 {
1366
a3559b66fba7 move primitives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1364
diff changeset
1359 DicomMap query;
2007
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2006
diff changeset
1360 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid, false);
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2006
diff changeset
1361 query.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid, false);
655489d9165d DicomMap::ParseDicomMetaInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2006
diff changeset
1362 query.SetValue(DICOM_TAG_SOP_INSTANCE_UID, instanceUid, false);
1371
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
1363 MoveInternal(targetAet, ResourceType_Instance, query);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1364 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1365
1186
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1366
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1367 void DicomUserConnection::SetTimeout(uint32_t seconds)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1368 {
2069
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1369 if (seconds == 0)
1186
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1370 {
2069
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1371 DisableTimeout();
1186
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1372 }
2069
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1373 else
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1374 {
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1375 dcmConnectionTimeout.set(seconds);
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1376 pimpl_->dimseTimeout_ = seconds;
3704
58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3700
diff changeset
1377 pimpl_->acseTimeout_ = seconds; // Timeout used during association negociation and ASC_releaseAssociation()
2069
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1378 }
1186
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1379 }
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1380
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1381
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1382 void DicomUserConnection::DisableTimeout()
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1383 {
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1384 /**
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1385 * Global timeout (seconds) for connecting to remote hosts.
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1386 * Default value is -1 which selects infinite timeout, i.e. blocking connect().
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1387 */
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1388 dcmConnectionTimeout.set(-1);
b17b6bd59747 timeouts for HTTP and DICOM
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1017
diff changeset
1389 pimpl_->dimseTimeout_ = 0;
3704
58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3700
diff changeset
1390 pimpl_->acseTimeout_ = 10; // Timeout used during association negociation and ASC_releaseAssociation()
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1391 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1392
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1393
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1394 void DicomUserConnection::CheckStorageSOPClassesInvariant() const
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1395 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1396 assert(storageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1397 defaultStorageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1398 reservedStorageSOPClasses_.size() <= MAXIMUM_STORAGE_SOP_CLASSES);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1399 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1400
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1401 void DicomUserConnection::AddStorageSOPClass(const char* sop)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1402 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1403 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1404
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1405 if (storageSOPClasses_.find(sop) != storageSOPClasses_.end())
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1406 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1407 // This storage SOP class is already explicitly registered. Do
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1408 // nothing.
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1409 return;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1410 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1411
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1412 if (defaultStorageSOPClasses_.find(sop) != defaultStorageSOPClasses_.end())
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1413 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1414 // This storage SOP class is not explicitly registered, but is
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1415 // used by default. Just register it explicitly.
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1416 defaultStorageSOPClasses_.erase(sop);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1417 storageSOPClasses_.insert(sop);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1418
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1419 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1420 return;
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1421 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1422
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1423 // This storage SOP class is neither explicitly, nor implicitly
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1424 // registered. Close the connection and register it explicitly.
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1425
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1426 Close();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1427
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1428 if (reservedStorageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1429 storageSOPClasses_.size() >= MAXIMUM_STORAGE_SOP_CLASSES) // (*)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1430 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1431 // The maximum number of SOP classes is reached
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1432 ResetStorageSOPClasses();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1433 defaultStorageSOPClasses_.erase(sop);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1434 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1435 else if (reservedStorageSOPClasses_.size() + storageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1436 defaultStorageSOPClasses_.size() >= MAXIMUM_STORAGE_SOP_CLASSES)
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1437 {
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1438 // Make room in the default storage syntaxes
1303
bba8a47922d1 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
1439 assert(!defaultStorageSOPClasses_.empty()); // Necessarily true because condition (*) is false
763
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1440 defaultStorageSOPClasses_.erase(*defaultStorageSOPClasses_.rbegin());
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1441 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1442
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1443 // Explicitly register the new storage syntax
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1444 storageSOPClasses_.insert(sop);
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1445
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1446 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1447 }
b5e6d2823115 dynamic negotiation of storage sop classes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 732
diff changeset
1448
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1449
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1450 void DicomUserConnection::FindWorklist(DicomFindAnswers& result,
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1451 ParsedDicomFile& query)
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1452 {
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1453 CheckIsOpen();
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1454
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1455 DcmDataset* dataset = query.GetDcmtkObject().getDataset();
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1456 const char* sopClass = UID_FINDModalityWorklistInformationModel;
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1457
3208
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
1458 ExecuteFind(result, pimpl_->assoc_, dataset, sopClass, true,
c4e1977e5ed7 improved logging in DicomUserConnection
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3117
diff changeset
1459 NULL, pimpl_->dimseTimeout_, remoteAet_);
1805
f08978b1f45b c-find scu for modality worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1737
diff changeset
1460 }
2069
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1461
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1462
2601
5b6c3d77a2a1 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2600
diff changeset
1463 void DicomUserConnection::SetDefaultTimeout(uint32_t seconds)
2069
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1464 {
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1465 LOG(INFO) << "Default timeout for DICOM connections if Orthanc acts as SCU (client): "
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1466 << seconds << " seconds (0 = no timeout)";
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1467 defaultTimeout_ = seconds;
fabf7820d1f1 New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2007
diff changeset
1468 }
2600
140a539b4eba SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2587
diff changeset
1469
140a539b4eba SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2587
diff changeset
1470
140a539b4eba SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2587
diff changeset
1471 bool DicomUserConnection::IsSameAssociation(const std::string& localAet,
140a539b4eba SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2587
diff changeset
1472 const RemoteModalityParameters& remote) const
140a539b4eba SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2587
diff changeset
1473 {
140a539b4eba SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2587
diff changeset
1474 return (localAet_ == localAet &&
140a539b4eba SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2587
diff changeset
1475 remoteAet_ == remote.GetApplicationEntityTitle() &&
140a539b4eba SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2587
diff changeset
1476 remoteHost_ == remote.GetHost() &&
2715
73bc0c32547c fix embedding openssl within a DLL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2601
diff changeset
1477 remotePort_ == remote.GetPortNumber() &&
2600
140a539b4eba SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2587
diff changeset
1478 manufacturer_ == remote.GetManufacturer());
140a539b4eba SequenceOfOperationsJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2587
diff changeset
1479 }
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1480
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1481
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1482 static void FillSopSequence(DcmDataset& dataset,
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1483 const DcmTagKey& tag,
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1484 const std::vector<std::string>& sopClassUids,
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1485 const std::vector<std::string>& sopInstanceUids,
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1486 const std::vector<StorageCommitmentFailureReason>& failureReasons,
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1487 bool hasFailureReasons)
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1488 {
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1489 assert(sopClassUids.size() == sopInstanceUids.size() &&
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1490 (hasFailureReasons ?
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1491 failureReasons.size() == sopClassUids.size() :
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1492 failureReasons.empty()));
3635
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1493
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1494 if (sopInstanceUids.empty())
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1495 {
3635
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1496 // Add an empty sequence
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1497 if (!dataset.insertEmptyElement(tag).good())
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1498 {
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1499 throw OrthancException(ErrorCode_InternalError);
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1500 }
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1501 }
3635
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1502 else
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1503 {
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1504 for (size_t i = 0; i < sopClassUids.size(); i++)
3635
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1505 {
3767
c6658187e4b1 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3741
diff changeset
1506 std::unique_ptr<DcmItem> item(new DcmItem);
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1507 if (!item->putAndInsertString(DCM_ReferencedSOPClassUID, sopClassUids[i].c_str()).good() ||
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1508 !item->putAndInsertString(DCM_ReferencedSOPInstanceUID, sopInstanceUids[i].c_str()).good() ||
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1509 (hasFailureReasons &&
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1510 !item->putAndInsertUint16(DCM_FailureReason, failureReasons[i]).good()) ||
3635
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1511 !dataset.insertSequenceItem(tag, item.release()).good())
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1512 {
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1513 throw OrthancException(ErrorCode_InternalError);
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1514 }
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1515 }
8c0ef729d5a8 StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3613
diff changeset
1516 }
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1517 }
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1518
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1519
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1520
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1521
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1522 void DicomUserConnection::ReportStorageCommitment(
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1523 const std::string& transactionUid,
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1524 const std::vector<std::string>& sopClassUids,
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1525 const std::vector<std::string>& sopInstanceUids,
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1526 const std::vector<StorageCommitmentFailureReason>& failureReasons)
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1527 {
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1528 if (sopClassUids.size() != sopInstanceUids.size() ||
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1529 sopClassUids.size() != failureReasons.size())
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1530 {
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1531 throw OrthancException(ErrorCode_ParameterOutOfRange);
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1532 }
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1533
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1534 if (IsOpen())
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1535 {
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1536 Close();
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1537 }
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1538
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1539 std::vector<std::string> successSopClassUids, successSopInstanceUids, failedSopClassUids, failedSopInstanceUids;
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1540 std::vector<StorageCommitmentFailureReason> failedReasons;
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1541
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1542 successSopClassUids.reserve(sopClassUids.size());
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1543 successSopInstanceUids.reserve(sopClassUids.size());
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1544 failedSopClassUids.reserve(sopClassUids.size());
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1545 failedSopInstanceUids.reserve(sopClassUids.size());
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1546 failedReasons.reserve(sopClassUids.size());
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1547
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1548 for (size_t i = 0; i < sopClassUids.size(); i++)
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1549 {
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1550 switch (failureReasons[i])
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1551 {
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1552 case StorageCommitmentFailureReason_Success:
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1553 successSopClassUids.push_back(sopClassUids[i]);
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1554 successSopInstanceUids.push_back(sopInstanceUids[i]);
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1555 break;
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1556
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1557 case StorageCommitmentFailureReason_ProcessingFailure:
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1558 case StorageCommitmentFailureReason_NoSuchObjectInstance:
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1559 case StorageCommitmentFailureReason_ResourceLimitation:
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1560 case StorageCommitmentFailureReason_ReferencedSOPClassNotSupported:
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1561 case StorageCommitmentFailureReason_ClassInstanceConflict:
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1562 case StorageCommitmentFailureReason_DuplicateTransactionUID:
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1563 failedSopClassUids.push_back(sopClassUids[i]);
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1564 failedSopInstanceUids.push_back(sopInstanceUids[i]);
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1565 failedReasons.push_back(failureReasons[i]);
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1566 break;
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1567
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1568 default:
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1569 {
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1570 char buf[16];
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1571 sprintf(buf, "%04xH", failureReasons[i]);
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1572 throw OrthancException(ErrorCode_ParameterOutOfRange,
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1573 "Unsupported failure reason for storage commitment: " + std::string(buf));
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1574 }
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1575 }
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1576 }
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1577
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1578 try
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1579 {
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1580 OpenInternal(Mode_ReportStorageCommitment);
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1581
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1582 /**
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1583 * N-EVENT-REPORT
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1584 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.3.html
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1585 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#table_10.1-1
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1586 *
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1587 * Status code:
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1588 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#sect_10.1.1.1.8
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1589 **/
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1590
3607
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1591 /**
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1592 * Send the "EVENT_REPORT_RQ" request
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1593 **/
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1594
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1595 LOG(INFO) << "Reporting modality \"" << remoteAet_
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1596 << "\" about storage commitment transaction: " << transactionUid
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1597 << " (" << successSopClassUids.size() << " successes, "
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1598 << failedSopClassUids.size() << " failures)";
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1599 const DIC_US messageId = pimpl_->assoc_->nextMsgID++;
3607
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1600
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1601 {
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1602 T_DIMSE_Message message;
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1603 memset(&message, 0, sizeof(message));
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1604 message.CommandField = DIMSE_N_EVENT_REPORT_RQ;
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1605
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1606 T_DIMSE_N_EventReportRQ& content = message.msg.NEventReportRQ;
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1607 content.MessageID = messageId;
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1608 strncpy(content.AffectedSOPClassUID, UID_StorageCommitmentPushModelSOPClass, DIC_UI_LEN);
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1609 strncpy(content.AffectedSOPInstanceUID, UID_StorageCommitmentPushModelSOPInstance, DIC_UI_LEN);
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1610 content.DataSetType = DIMSE_DATASET_PRESENT;
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1611
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1612 DcmDataset dataset;
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1613 if (!dataset.putAndInsertString(DCM_TransactionUID, transactionUid.c_str()).good())
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1614 {
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1615 throw OrthancException(ErrorCode_InternalError);
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1616 }
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1617
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1618 {
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1619 std::vector<StorageCommitmentFailureReason> empty;
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1620 FillSopSequence(dataset, DCM_ReferencedSOPSequence, successSopClassUids,
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1621 successSopInstanceUids, empty, false);
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1622 }
3607
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1623
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1624 // http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.3.html
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1625 if (failedSopClassUids.empty())
3607
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1626 {
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1627 content.EventTypeID = 1; // "Storage Commitment Request Successful"
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1628 }
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1629 else
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1630 {
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1631 content.EventTypeID = 2; // "Storage Commitment Request Complete - Failures Exist"
3613
c1e2b91c2ab4 all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3611
diff changeset
1632
c1e2b91c2ab4 all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3611
diff changeset
1633 // Failure reason
c1e2b91c2ab4 all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3611
diff changeset
1634 // http://dicom.nema.org/medical/dicom/2019a/output/chtml/part03/sect_C.14.html#sect_C.14.1.1
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1635 FillSopSequence(dataset, DCM_FailedSOPSequence, failedSopClassUids,
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1636 failedSopInstanceUids, failedReasons, true);
3607
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1637 }
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1638
3607
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1639 int presID = ASC_findAcceptedPresentationContextID(
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1640 pimpl_->assoc_, UID_StorageCommitmentPushModelSOPClass);
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1641 if (presID == 0)
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1642 {
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1643 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1644 "Unable to send N-EVENT-REPORT request to AET: " + remoteAet_);
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1645 }
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1646
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1647 if (!DIMSE_sendMessageUsingMemoryData(
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1648 pimpl_->assoc_, presID, &message, NULL /* status detail */,
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1649 &dataset, NULL /* callback */, NULL /* callback context */,
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1650 NULL /* commandSet */).good())
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1651 {
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1652 throw OrthancException(ErrorCode_NetworkProtocol);
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1653 }
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1654 }
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1655
3607
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1656 /**
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1657 * Read the "EVENT_REPORT_RSP" response
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1658 **/
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1659
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1660 {
3607
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1661 T_ASC_PresentationContextID presID = 0;
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1662 T_DIMSE_Message message;
3706
bd34b6ac5c08 timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3705
diff changeset
1663
bd34b6ac5c08 timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3705
diff changeset
1664 const int timeout = pimpl_->dimseTimeout_;
bd34b6ac5c08 timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3705
diff changeset
1665 if (!DIMSE_receiveCommand(pimpl_->assoc_,
bd34b6ac5c08 timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3705
diff changeset
1666 (timeout ? DIMSE_NONBLOCKING : DIMSE_BLOCKING), timeout,
bd34b6ac5c08 timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3705
diff changeset
1667 &presID, &message, NULL /* no statusDetail */).good() ||
3607
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1668 message.CommandField != DIMSE_N_EVENT_REPORT_RSP)
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1669 {
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1670 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1671 "Unable to read N-EVENT-REPORT response from AET: " + remoteAet_);
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1672 }
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1673
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1674 const T_DIMSE_N_EventReportRSP& content = message.msg.NEventReportRSP;
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1675 if (content.MessageIDBeingRespondedTo != messageId ||
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1676 !(content.opts & O_NEVENTREPORT_AFFECTEDSOPCLASSUID) ||
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1677 !(content.opts & O_NEVENTREPORT_AFFECTEDSOPINSTANCEUID) ||
3609
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1678 //(content.opts & O_NEVENTREPORT_EVENTTYPEID) || // Pedantic test - The "content.EventTypeID" is not used by Orthanc
3607
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1679 std::string(content.AffectedSOPClassUID) != UID_StorageCommitmentPushModelSOPClass ||
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1680 std::string(content.AffectedSOPInstanceUID) != UID_StorageCommitmentPushModelSOPInstance ||
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1681 content.DataSetType != DIMSE_DATASET_NULL)
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1682 {
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1683 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1684 "Badly formatted N-EVENT-REPORT response from AET: " + remoteAet_);
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1685 }
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1686
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1687 if (content.DimseStatus != 0 /* success */)
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1688 {
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1689 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1690 "The request cannot be handled by remote AET: " + remoteAet_);
d0ecb355db33 DicomUserConnection::ReportStorageCommitment() complete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3606
diff changeset
1691 }
3606
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1692 }
33ba63637d48 DicomUserConnection: sending N-EVENT-REPORT-RQ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3605
diff changeset
1693
3605
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1694 Close();
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1695 }
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1696 catch (OrthancException&)
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1697 {
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1698 Close();
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1699 throw;
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1700 }
05872838ebf3 DicomUserConnection: Opening of a connection for N-EVENT-REPORT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3561
diff changeset
1701 }
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1702
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1703
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1704
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1705 void DicomUserConnection::RequestStorageCommitment(
3611
0ce9c1c6474f test route in REST API for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3610
diff changeset
1706 const std::string& transactionUid,
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1707 const std::vector<std::string>& sopClassUids,
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1708 const std::vector<std::string>& sopInstanceUids)
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1709 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1710 if (sopClassUids.size() != sopInstanceUids.size())
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1711 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1712 throw OrthancException(ErrorCode_ParameterOutOfRange);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1713 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1714
3741
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1715 for (size_t i = 0; i < sopClassUids.size(); i++)
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1716 {
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1717 if (sopClassUids[i].empty() ||
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1718 sopInstanceUids[i].empty())
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1719 {
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1720 throw OrthancException(ErrorCode_ParameterOutOfRange,
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1721 "The SOP class/instance UIDs cannot be empty, found: \"" +
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1722 sopClassUids[i] + "\" / \"" + sopInstanceUids[i] + "\"");
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1723 }
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1724 }
21efa32c8a10 safeguard
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3734
diff changeset
1725
3611
0ce9c1c6474f test route in REST API for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3610
diff changeset
1726 if (transactionUid.size() < 5 ||
0ce9c1c6474f test route in REST API for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3610
diff changeset
1727 transactionUid.substr(0, 5) != "2.25.")
0ce9c1c6474f test route in REST API for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3610
diff changeset
1728 {
0ce9c1c6474f test route in REST API for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3610
diff changeset
1729 throw OrthancException(ErrorCode_ParameterOutOfRange);
0ce9c1c6474f test route in REST API for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3610
diff changeset
1730 }
0ce9c1c6474f test route in REST API for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3610
diff changeset
1731
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1732 if (IsOpen())
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1733 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1734 Close();
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1735 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1736
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1737 try
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1738 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1739 OpenInternal(Mode_RequestStorageCommitment);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1740
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1741 /**
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1742 * N-ACTION
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1743 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.2.html
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1744 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#table_10.1-4
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1745 *
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1746 * Status code:
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1747 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#sect_10.1.1.1.8
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1748 **/
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1749
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1750 /**
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1751 * Send the "N_ACTION_RQ" request
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1752 **/
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1753
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1754 LOG(INFO) << "Request to modality \"" << remoteAet_
3611
0ce9c1c6474f test route in REST API for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3610
diff changeset
1755 << "\" about storage commitment for " << sopClassUids.size()
0ce9c1c6474f test route in REST API for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3610
diff changeset
1756 << " instances, with transaction UID: " << transactionUid;
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1757 const DIC_US messageId = pimpl_->assoc_->nextMsgID++;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1758
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1759 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1760 T_DIMSE_Message message;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1761 memset(&message, 0, sizeof(message));
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1762 message.CommandField = DIMSE_N_ACTION_RQ;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1763
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1764 T_DIMSE_N_ActionRQ& content = message.msg.NActionRQ;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1765 content.MessageID = messageId;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1766 strncpy(content.RequestedSOPClassUID, UID_StorageCommitmentPushModelSOPClass, DIC_UI_LEN);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1767 strncpy(content.RequestedSOPInstanceUID, UID_StorageCommitmentPushModelSOPInstance, DIC_UI_LEN);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1768 content.ActionTypeID = 1; // "Request Storage Commitment"
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1769 content.DataSetType = DIMSE_DATASET_PRESENT;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1770
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1771 DcmDataset dataset;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1772 if (!dataset.putAndInsertString(DCM_TransactionUID, transactionUid.c_str()).good())
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1773 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1774 throw OrthancException(ErrorCode_InternalError);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1775 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1776
3657
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1777 {
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1778 std::vector<StorageCommitmentFailureReason> empty;
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1779 FillSopSequence(dataset, DCM_ReferencedSOPSequence, sopClassUids, sopInstanceUids, empty, false);
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1780 }
115f82775c46 handling of storage commitment failure reasons
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3641
diff changeset
1781
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1782 int presID = ASC_findAcceptedPresentationContextID(
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1783 pimpl_->assoc_, UID_StorageCommitmentPushModelSOPClass);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1784 if (presID == 0)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1785 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1786 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
3609
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1787 "Unable to send N-ACTION request to AET: " + remoteAet_);
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1788 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1789
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1790 if (!DIMSE_sendMessageUsingMemoryData(
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1791 pimpl_->assoc_, presID, &message, NULL /* status detail */,
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1792 &dataset, NULL /* callback */, NULL /* callback context */,
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1793 NULL /* commandSet */).good())
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1794 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1795 throw OrthancException(ErrorCode_NetworkProtocol);
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1796 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1797 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1798
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1799 /**
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1800 * Read the "N_ACTION_RSP" response
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1801 **/
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1802
3609
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1803 {
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1804 T_ASC_PresentationContextID presID = 0;
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1805 T_DIMSE_Message message;
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1806
3706
bd34b6ac5c08 timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3705
diff changeset
1807 const int timeout = pimpl_->dimseTimeout_;
bd34b6ac5c08 timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3705
diff changeset
1808 if (!DIMSE_receiveCommand(pimpl_->assoc_,
bd34b6ac5c08 timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3705
diff changeset
1809 (timeout ? DIMSE_NONBLOCKING : DIMSE_BLOCKING), timeout,
bd34b6ac5c08 timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3705
diff changeset
1810 &presID, &message, NULL /* no statusDetail */).good() ||
3609
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1811 message.CommandField != DIMSE_N_ACTION_RSP)
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1812 {
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1813 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1814 "Unable to read N-ACTION response from AET: " + remoteAet_);
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1815 }
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1816
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1817 const T_DIMSE_N_ActionRSP& content = message.msg.NActionRSP;
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1818 if (content.MessageIDBeingRespondedTo != messageId ||
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1819 !(content.opts & O_NACTION_AFFECTEDSOPCLASSUID) ||
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1820 !(content.opts & O_NACTION_AFFECTEDSOPINSTANCEUID) ||
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1821 //(content.opts & O_NACTION_ACTIONTYPEID) || // Pedantic test - The "content.ActionTypeID" is not used by Orthanc
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1822 std::string(content.AffectedSOPClassUID) != UID_StorageCommitmentPushModelSOPClass ||
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1823 std::string(content.AffectedSOPInstanceUID) != UID_StorageCommitmentPushModelSOPInstance ||
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1824 content.DataSetType != DIMSE_DATASET_NULL)
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1825 {
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1826 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1827 "Badly formatted N-ACTION response from AET: " + remoteAet_);
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1828 }
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1829
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1830 if (content.DimseStatus != 0 /* success */)
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1831 {
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1832 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1833 "The request cannot be handled by remote AET: " + remoteAet_);
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1834 }
f7ade98d8229 done RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3608
diff changeset
1835 }
3608
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1836
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1837 Close();
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1838 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1839 catch (OrthancException&)
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1840 {
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1841 Close();
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1842 throw;
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1843 }
7ae553d9c366 created DicomUserConnection::RequestStorageCommitment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3607
diff changeset
1844 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1845 }