Mercurial > hg > orthanc

comparison OrthancServer/Sources/QueryRetrieveHandler.cpp @ 4105:c02a2d9efbc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move FromDcmtkBridge::ExecuteToDicom() to LuaFunctionCall, to remove dependency of DCMTK on Lua
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 06 Jul 2020 13:48:10 +0200
parents 05b8fd21089c
children a4f28efdfccf
comparison
equal deleted inserted replaced
4104:d5c09b5f882f 4105:c02a2d9efbc2
37 #include "OrthancConfiguration.h" 37 #include "OrthancConfiguration.h"
38 38
39 #include "../../OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.h" 39 #include "../../OrthancFramework/Sources/DicomNetworking/DicomControlUserConnection.h"
40 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" 40 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
41 #include "../../OrthancFramework/Sources/Logging.h" 41 #include "../../OrthancFramework/Sources/Logging.h"
42 #include "../../OrthancFramework/Sources/Lua/LuaFunctionCall.h"
42 #include "LuaScripting.h" 43 #include "LuaScripting.h"
43 #include "ServerContext.h" 44 #include "ServerContext.h"
44 45
45 46
46 namespace Orthanc 47 namespace Orthanc
56 if (lock.GetLua().IsExistingFunction(LUA_CALLBACK)) 57 if (lock.GetLua().IsExistingFunction(LUA_CALLBACK))
57 { 58 {
58 LuaFunctionCall call(lock.GetLua(), LUA_CALLBACK); 59 LuaFunctionCall call(lock.GetLua(), LUA_CALLBACK);
59 call.PushDicom(query); 60 call.PushDicom(query);
60 call.PushJson(modality); 61 call.PushJson(modality);
61 FromDcmtkBridge::ExecuteToDicom(query, call); 62 call.ExecuteToDicom(query);
62 } 63 }
63 } 64 }
64 65
65 66
66 void QueryRetrieveHandler::Invalidate() 67 void QueryRetrieveHandler::Invalidate()