Mercurial > hg > orthanc

comparison OrthancServer/Internals/MoveScp.cpp @ 2381:b8969010b534

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncoupling DCMTK primitives from Orthanc::Configuration
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 29 Aug 2017 19:59:01 +0200
parents a3a65de1840f
children
comparison
equal deleted inserted replaced
2380:96b3ec054b69 2381:b8969010b534
85 85
86 #include <memory> 86 #include <memory>
87 87
88 #include "../FromDcmtkBridge.h" 88 #include "../FromDcmtkBridge.h"
89 #include "../ToDcmtkBridge.h" 89 #include "../ToDcmtkBridge.h"
90 #include "../OrthancInitialization.h"
91 #include "../../Core/Logging.h" 90 #include "../../Core/Logging.h"
92 #include "../../Core/OrthancException.h" 91 #include "../../Core/OrthancException.h"
93 92
94 #include <boost/lexical_cast.hpp> 93 #include <boost/lexical_cast.hpp>
95 94
167 166
168 MoveScpData& data = *reinterpret_cast<MoveScpData*>(callbackData); 167 MoveScpData& data = *reinterpret_cast<MoveScpData*>(callbackData);
169 if (data.lastRequest_ == NULL) 168 if (data.lastRequest_ == NULL)
170 { 169 {
171 DicomMap input; 170 DicomMap input;
172 Configuration::ExtractDicomSummary(input, *requestIdentifiers); 171 FromDcmtkBridge::ExtractDicomSummary(input, *requestIdentifiers);
173 172
174 try 173 try
175 { 174 {
176 data.iterator_.reset(data.handler_->Handle(data.target_, input, *data.remoteIp_, *data.remoteAet_, 175 data.iterator_.reset(data.handler_->Handle(data.target_, input, *data.remoteIp_, *data.remoteAet_,
177 *data.calledAet_, GetMessageId(input))); 176 *data.calledAet_, GetMessageId(input)));