Mercurial > hg > orthanc
annotate OrthancServer/Internals/StoreScp.cpp @ 2015:bcc575732aef
New option "--logfile" to output the Orthanc log to the given file
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 13 Jun 2016 15:07:53 +0200 |
| parents | cda5b0ab4ce5 |
| children | 4b02ec79728a |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
| 1900 | 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 |
| 0 | 5 * |
| 6 * This program is free software: you can redistribute it and/or | |
| 7 * modify it under the terms of the GNU General Public License as | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 136 | 10 * |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 0 | 22 * |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
| 32 | |
|
766
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
33 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
34 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
35 /*========================================================================= |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
36 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
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:
730
diff
changeset
|
38 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
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:
730
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:
730
diff
changeset
|
41 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
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:
730
diff
changeset
|
43 All rights reserved. |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
44 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
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:
730
diff
changeset
|
46 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
47 OFFIS e.V. |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
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:
730
diff
changeset
|
49 Escherweg 2 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
50 26121 Oldenburg, Germany |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
51 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
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:
730
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:
730
diff
changeset
|
54 are met: |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
55 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
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:
730
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:
730
diff
changeset
|
58 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
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:
730
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:
730
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:
730
diff
changeset
|
62 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
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:
730
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:
730
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:
730
diff
changeset
|
66 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
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:
730
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:
730
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:
730
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:
730
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:
730
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:
730
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:
730
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:
730
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:
730
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:
730
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:
730
diff
changeset
|
78 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
79 =========================================================================*/ |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
80 |
|
0a2f8c707c78
Fix missing licensing terms about reuse of some DCMTK code
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
730
diff
changeset
|
81 |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
82 #include "../PrecompiledHeadersServer.h" |
| 0 | 83 #include "StoreScp.h" |
| 84 | |
| 85 #include "../FromDcmtkBridge.h" | |
|
730
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
86 #include "../ServerToolbox.h" |
| 0 | 87 #include "../ToDcmtkBridge.h" |
|
1928
84c7eaeb5244
Configuration::GetDefaultEncoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
88 #include "../OrthancInitialization.h" |
| 62 | 89 #include "../../Core/OrthancException.h" |
|
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1333
diff
changeset
|
90 #include "../../Core/Logging.h" |
| 0 | 91 |
| 92 #include <dcmtk/dcmdata/dcfilefo.h> | |
| 93 #include <dcmtk/dcmdata/dcmetinf.h> | |
| 94 #include <dcmtk/dcmdata/dcostrmb.h> | |
| 95 #include <dcmtk/dcmdata/dcdeftag.h> | |
| 96 #include <dcmtk/dcmnet/diutil.h> | |
| 97 | |
| 98 | |
| 62 | 99 namespace Orthanc |
| 0 | 100 { |
| 101 namespace | |
| 102 { | |
| 103 struct StoreCallbackData | |
| 104 { | |
| 105 IStoreRequestHandler* handler; | |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
106 const std::string* remoteIp; |
|
1285
5730f374e4e6
Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1004
diff
changeset
|
107 const char* remoteAET; |
|
5730f374e4e6
Access to called AET and remote AET from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1004
diff
changeset
|
108 const char* calledAET; |
| 0 | 109 const char* modality; |
| 110 const char* affectedSOPInstanceUID; | |
| 111 uint32_t messageID; | |
| 112 }; | |
| 113 | |
|
730
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
114 |
| 0 | 115 static void |
| 116 storeScpCallback( | |
| 117 void *callbackData, | |
| 118 T_DIMSE_StoreProgress *progress, | |
| 119 T_DIMSE_C_StoreRQ *req, | |
| 120 char * /*imageFileName*/, DcmDataset **imageDataSet, | |
| 121 T_DIMSE_C_StoreRSP *rsp, | |
| 122 DcmDataset **statusDetail) | |
| 123 /* | |
| 124 * This function.is used to indicate progress when storescp receives instance data over the | |
| 125 * network. On the final call to this function (identified by progress->state == DIMSE_StoreEnd) | |
| 126 * this function will store the data set which was received over the network to a file. | |
| 127 * Earlier calls to this function will simply cause some information to be dumped to stdout. | |
| 128 * | |
| 129 * Parameters: | |
| 130 * callbackData - [in] data for this callback function | |
| 131 * progress - [in] The state of progress. (identifies if this is the initial or final call | |
| 132 * to this function, or a call in between these two calls. | |
| 133 * req - [in] The original store request message. | |
| 134 * imageFileName - [in] The path to and name of the file the information shall be written to. | |
| 135 * imageDataSet - [in] The data set which shall be stored in the image file | |
| 136 * rsp - [inout] the C-STORE-RSP message (will be sent after the call to this function) | |
| 137 * statusDetail - [inout] This variable can be used to capture detailed information with regard to | |
| 138 * the status information which is captured in the status element (0000,0900). Note | |
| 139 * that this function does specify any such information, the pointer will be set to NULL. | |
| 140 */ | |
| 141 { | |
| 142 StoreCallbackData *cbdata = OFstatic_cast(StoreCallbackData *, callbackData); | |
| 143 | |
| 144 DIC_UI sopClass; | |
| 145 DIC_UI sopInstance; | |
| 146 | |
| 147 // if this is the final call of this function, save the data which was received to a file | |
| 148 // (note that we could also save the image somewhere else, put it in database, etc.) | |
| 149 if (progress->state == DIMSE_StoreEnd) | |
| 150 { | |
| 151 OFString tmpStr; | |
| 152 | |
| 153 // do not send status detail information | |
| 154 *statusDetail = NULL; | |
| 155 | |
| 156 // Concerning the following line: an appropriate status code is already set in the resp structure, | |
| 157 // it need not be success. For example, if the caller has already detected an out of resources problem | |
| 158 // then the status will reflect this. The callback function is still called to allow cleanup. | |
| 159 //rsp->DimseStatus = STATUS_Success; | |
| 160 | |
| 161 // we want to write the received information to a file only if this information | |
| 162 // is present and the options opt_bitPreserving and opt_ignore are not set. | |
| 163 if ((imageDataSet != NULL) && (*imageDataSet != NULL)) | |
| 164 { | |
| 165 DicomMap summary; | |
| 166 Json::Value dicomJson; | |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
194
diff
changeset
|
167 std::string buffer; |
| 0 | 168 |
| 169 try | |
| 170 { | |
|
1929
cda5b0ab4ce5
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1928
diff
changeset
|
171 const Encoding defaultEncoding = Configuration::GetDefaultEncoding(); |
|
cda5b0ab4ce5
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1928
diff
changeset
|
172 FromDcmtkBridge::Convert(summary, **imageDataSet, |
|
cda5b0ab4ce5
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1928
diff
changeset
|
173 ORTHANC_MAXIMUM_TAG_LENGTH, |
|
cda5b0ab4ce5
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1928
diff
changeset
|
174 defaultEncoding); |
| 1686 | 175 FromDcmtkBridge::ToJson(dicomJson, **imageDataSet, |
|
1735
a001f6226c7c
primitives for flags in dicom-to-json conversions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
176 DicomToJsonFormat_Full, |
|
a001f6226c7c
primitives for flags in dicom-to-json conversions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1701
diff
changeset
|
177 DicomToJsonFlags_Default, |
|
1928
84c7eaeb5244
Configuration::GetDefaultEncoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
178 ORTHANC_MAXIMUM_TAG_LENGTH, |
|
1929
cda5b0ab4ce5
ORTHANC_MAXIMUM_TAG_LENGTH made explicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1928
diff
changeset
|
179 defaultEncoding); |
| 0 | 180 |
|
1004
a226e0959d8b
DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
181 if (!FromDcmtkBridge::SaveToMemoryBuffer(buffer, **imageDataSet)) |
| 0 | 182 { |
|
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
183 LOG(ERROR) << "cannot write DICOM file to memory"; |
| 0 | 184 rsp->DimseStatus = STATUS_STORE_Refused_OutOfResources; |
| 185 } | |
| 186 } | |
| 187 catch (...) | |
| 188 { | |
| 189 rsp->DimseStatus = STATUS_STORE_Refused_OutOfResources; | |
| 190 } | |
| 191 | |
| 192 // check the image to make sure it is consistent, i.e. that its sopClass and sopInstance correspond | |
| 193 // to those mentioned in the request. If not, set the status in the response message variable. | |
|
1333
732b6a4ed541
clang warning removal
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
194 if (rsp->DimseStatus == STATUS_Success) |
| 0 | 195 { |
| 196 // which SOP class and SOP instance ? | |
| 197 if (!DU_findSOPClassAndInstanceInDataSet(*imageDataSet, sopClass, sopInstance, /*opt_correctUIDPadding*/ OFFalse)) | |
| 198 { | |
| 101 | 199 //LOG4CPP_ERROR(Internals::GetLogger(), "bad DICOM file: " << fileName); |
| 0 | 200 rsp->DimseStatus = STATUS_STORE_Error_CannotUnderstand; |
| 201 } | |
| 202 else if (strcmp(sopClass, req->AffectedSOPClassUID) != 0) | |
| 203 { | |
| 204 rsp->DimseStatus = STATUS_STORE_Error_DataSetDoesNotMatchSOPClass; | |
| 205 } | |
| 206 else if (strcmp(sopInstance, req->AffectedSOPInstanceUID) != 0) | |
| 207 { | |
| 208 rsp->DimseStatus = STATUS_STORE_Error_DataSetDoesNotMatchSOPClass; | |
| 209 } | |
| 210 else | |
| 211 { | |
| 212 try | |
| 213 { | |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
214 cbdata->handler->Handle(buffer, summary, dicomJson, *cbdata->remoteIp, cbdata->remoteAET, cbdata->calledAET); |
| 0 | 215 } |
| 62 | 216 catch (OrthancException& e) |
| 0 | 217 { |
| 218 rsp->DimseStatus = STATUS_STORE_Refused_OutOfResources; | |
|
730
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
219 |
|
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
220 if (e.GetErrorCode() == ErrorCode_InexistentTag) |
|
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
221 { |
|
1668
de1413733c97
reconstructing main dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
222 Toolbox::LogMissingRequiredTag(summary); |
|
730
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
223 } |
|
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
224 else |
|
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
225 { |
|
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
226 LOG(ERROR) << "Exception while storing DICOM: " << e.What(); |
|
309e686b41e7
better logging about nonexistent tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
227 } |
| 0 | 228 } |
| 229 } | |
| 230 } | |
| 231 } | |
| 232 } | |
| 233 } | |
| 234 } | |
| 235 | |
| 236 /* | |
| 237 * This function processes a DIMSE C-STORE-RQ commmand that was | |
| 238 * received over the network connection. | |
| 239 * | |
| 240 * Parameters: | |
| 241 * assoc - [in] The association (network connection to another DICOM application). | |
| 242 * msg - [in] The DIMSE C-STORE-RQ message that was received. | |
| 243 * presID - [in] The ID of the presentation context which was specified in the PDV which contained | |
| 244 * the DIMSE command. | |
| 245 */ | |
| 246 OFCondition Internals::storeScp(T_ASC_Association * assoc, | |
| 247 T_DIMSE_Message * msg, | |
| 248 T_ASC_PresentationContextID presID, | |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
249 IStoreRequestHandler& handler, |
|
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
250 const std::string& remoteIp) |
| 0 | 251 { |
| 252 OFCondition cond = EC_Normal; | |
| 253 T_DIMSE_C_StoreRQ *req; | |
| 254 | |
| 255 // assign the actual information of the C-STORE-RQ command to a local variable | |
| 256 req = &msg->msg.CStoreRQ; | |
| 257 | |
| 258 // intialize some variables | |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
259 StoreCallbackData data; |
|
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
260 data.handler = &handler; |
|
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
261 data.remoteIp = &remoteIp; |
|
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
262 data.modality = dcmSOPClassUIDToModality(req->AffectedSOPClassUID/*, "UNKNOWN"*/); |
|
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
263 if (data.modality == NULL) |
|
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
264 data.modality = "UNKNOWN"; |
| 101 | 265 |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
266 data.affectedSOPInstanceUID = req->AffectedSOPInstanceUID; |
|
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
267 data.messageID = req->MessageID; |
| 0 | 268 if (assoc && assoc->params) |
| 269 { | |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
270 data.remoteAET = assoc->params->DULparams.callingAPTitle; |
|
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
271 data.calledAET = assoc->params->DULparams.calledAPTitle; |
| 0 | 272 } |
| 273 else | |
| 274 { | |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
275 data.remoteAET = ""; |
|
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
276 data.calledAET = ""; |
| 0 | 277 } |
| 278 | |
| 279 DcmFileFormat dcmff; | |
| 280 | |
| 281 // store SourceApplicationEntityTitle in metaheader | |
| 282 if (assoc && assoc->params) | |
| 283 { | |
| 284 const char *aet = assoc->params->DULparams.callingAPTitle; | |
| 285 if (aet) dcmff.getMetaInfo()->putAndInsertString(DCM_SourceApplicationEntityTitle, aet); | |
| 286 } | |
| 287 | |
| 288 // define an address where the information which will be received over the network will be stored | |
| 289 DcmDataset *dset = dcmff.getDataset(); | |
| 290 | |
| 291 cond = DIMSE_storeProvider(assoc, presID, req, NULL, /*opt_useMetaheader*/OFFalse, &dset, | |
|
1573
3309878b3e16
more information about the origin of requests submitted to the DICOM handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
292 storeScpCallback, &data, |
| 0 | 293 /*opt_blockMode*/ DIMSE_BLOCKING, |
| 294 /*opt_dimse_timeout*/ 0); | |
| 295 | |
| 296 // if some error occured, dump corresponding information and remove the outfile if necessary | |
| 297 if (cond.bad()) | |
| 298 { | |
| 299 OFString temp_str; | |
|
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
300 LOG(ERROR) << "Store SCP Failed: " << cond.text(); |
| 0 | 301 } |
| 302 | |
| 303 // return return value | |
| 304 return cond; | |
| 305 } | |
| 306 } |