comparison OrthancServer/OrthancMoveRequestHandler.cpp @ 1573:3309878b3e16

more information about the origin of requests submitted to the DICOM handlers
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 25 Aug 2015 13:05:22 +0200
parents f967bdf8534e
children 3bcb01028107
comparison
equal deleted inserted replaced
1572:904096e7367e 1573:3309878b3e16
128 return true; 128 return true;
129 } 129 }
130 } 130 }
131 131
132 132
133 IMoveRequestIterator* OrthancMoveRequestHandler::Handle(const std::string& aet, 133 IMoveRequestIterator* OrthancMoveRequestHandler::Handle(const std::string& targetAet,
134 const DicomMap& input) 134 const DicomMap& input,
135 const std::string& remoteIp,
136 const std::string& remoteAet)
135 { 137 {
136 LOG(WARNING) << "Move-SCU request received for AET \"" << aet << "\""; 138 LOG(WARNING) << "Move-SCU request received for AET \"" << targetAet << "\"";
137 139
138 { 140 {
139 DicomArray query(input); 141 DicomArray query(input);
140 for (size_t i = 0; i < query.GetSize(); i++) 142 for (size_t i = 0; i < query.GetSize(); i++)
141 { 143 {
174 if (LookupIdentifier(publicId, DICOM_TAG_SOP_INSTANCE_UID, input) || 176 if (LookupIdentifier(publicId, DICOM_TAG_SOP_INSTANCE_UID, input) ||
175 LookupIdentifier(publicId, DICOM_TAG_SERIES_INSTANCE_UID, input) || 177 LookupIdentifier(publicId, DICOM_TAG_SERIES_INSTANCE_UID, input) ||
176 LookupIdentifier(publicId, DICOM_TAG_STUDY_INSTANCE_UID, input) || 178 LookupIdentifier(publicId, DICOM_TAG_STUDY_INSTANCE_UID, input) ||
177 LookupIdentifier(publicId, DICOM_TAG_PATIENT_ID, input)) 179 LookupIdentifier(publicId, DICOM_TAG_PATIENT_ID, input))
178 { 180 {
179 return new OrthancMoveRequestIterator(context_, aet, publicId); 181 return new OrthancMoveRequestIterator(context_, targetAet, publicId);
180 } 182 }
181 else 183 else
182 { 184 {
183 // No identifier is present in the request. 185 // No identifier is present in the request.
184 throw OrthancException(ErrorCode_BadRequest); 186 throw OrthancException(ErrorCode_BadRequest);
219 if (!ok) 221 if (!ok)
220 { 222 {
221 throw OrthancException(ErrorCode_BadRequest); 223 throw OrthancException(ErrorCode_BadRequest);
222 } 224 }
223 225
224 return new OrthancMoveRequestIterator(context_, aet, publicId); 226 return new OrthancMoveRequestIterator(context_, targetAet, publicId);
225 } 227 }
226 } 228 }