Mercurial > hg > orthanc

comparison OrthancServer/QueryRetrieveHandler.cpp @ 3843:138d0dde41b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
end of replacements of DicomUserConnection by DicomControlUserConnection
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 16 Apr 2020 17:24:24 +0200
parents 94f4a18a79cc
children 2effa961f67f
comparison
equal deleted inserted replaced
3842:bdbe12aba99f 3843:138d0dde41b5
34 #include "PrecompiledHeadersServer.h" 34 #include "PrecompiledHeadersServer.h"
35 #include "QueryRetrieveHandler.h" 35 #include "QueryRetrieveHandler.h"
36 36
37 #include "OrthancConfiguration.h" 37 #include "OrthancConfiguration.h"
38 38
39 #include "../Core/DicomNetworking/DicomControlUserConnection.h"
39 #include "../Core/DicomParsing/FromDcmtkBridge.h" 40 #include "../Core/DicomParsing/FromDcmtkBridge.h"
40 #include "../Core/Logging.h" 41 #include "../Core/Logging.h"
41 #include "LuaScripting.h" 42 #include "LuaScripting.h"
42 #include "ServerContext.h" 43 #include "ServerContext.h"
43 44
79 80
80 // Secondly, possibly fix the query with the user-provider Lua callback 81 // Secondly, possibly fix the query with the user-provider Lua callback
81 FixQueryLua(fixed, context_, modality_.GetApplicationEntityTitle()); 82 FixQueryLua(fixed, context_, modality_.GetApplicationEntityTitle());
82 83
83 { 84 {
84 DicomUserConnection connection(localAet_, modality_); 85 DicomControlUserConnection connection(localAet_, modality_);
85 connection.Open();
86 connection.Find(answers_, level_, fixed, findNormalized_); 86 connection.Find(answers_, level_, fixed, findNormalized_);
87 } 87 }
88 88
89 done_ = true; 89 done_ = true;
90 } 90 }