Mercurial > hg > orthanc

comparison OrthancServer/QueryRetrieveHandler.cpp @ 2221:e7beca979562

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix Windows build due to overwriting a macro
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 13 Dec 2016 12:13:12 +0100
parents 3eefb84ac0bd
children a3a65de1840f
comparison
equal deleted inserted replaced
2220:0fb6e0461105 2221:e7beca979562
41 { 41 {
42 static void FixQuery(DicomMap& query, 42 static void FixQuery(DicomMap& query,
43 ServerContext& context, 43 ServerContext& context,
44 const std::string& modality) 44 const std::string& modality)
45 { 45 {
46 static const char* LUA_CALLBACK = "OutgoingFindRequestFilter";
47
46 LuaScripting::Locker locker(context.GetLua()); 48 LuaScripting::Locker locker(context.GetLua());
47 static const char* CALLBACK = "OutgoingFindRequestFilter"; 49 if (locker.GetLua().IsExistingFunction(LUA_CALLBACK))
48
49 if (locker.GetLua().IsExistingFunction(CALLBACK))
50 { 50 {
51 LuaFunctionCall call(locker.GetLua(), CALLBACK); 51 LuaFunctionCall call(locker.GetLua(), LUA_CALLBACK);
52 call.PushDicom(query); 52 call.PushDicom(query);
53 call.PushJson(modality); 53 call.PushJson(modality);
54 FromDcmtkBridge::ExecuteToDicom(query, call); 54 FromDcmtkBridge::ExecuteToDicom(query, call);
55 } 55 }
56 } 56 }