Mercurial > hg > orthanc
comparison OrthancServer/LuaScripting.cpp @ 1574:0c29ebe80ac9
give access to full request origin in ReceivedInstanceFilter (Lua)
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 25 Aug 2015 13:37:57 +0200 |
parents | 904096e7367e |
children | d7e569640d09 |
comparison
equal
deleted
inserted
replaced
1573:3309878b3e16 | 1574:0c29ebe80ac9 |
---|---|
468 OnStableResource(change); | 468 OnStableResource(change); |
469 } | 469 } |
470 } | 470 } |
471 | 471 |
472 | 472 |
473 bool LuaScripting::FilterIncomingInstance(const Json::Value& simplified, | 473 bool LuaScripting::FilterIncomingInstance(const DicomInstanceToStore& instance, |
474 const std::string& remoteAet) | 474 const Json::Value& simplified) |
475 { | 475 { |
476 static const char* NAME = "ReceivedInstanceFilter"; | 476 static const char* NAME = "ReceivedInstanceFilter"; |
477 | 477 |
478 boost::recursive_mutex::scoped_lock lock(mutex_); | 478 boost::recursive_mutex::scoped_lock lock(mutex_); |
479 | 479 |
480 if (lua_.IsExistingFunction(NAME)) | 480 if (lua_.IsExistingFunction(NAME)) |
481 { | 481 { |
482 LuaFunctionCall call(lua_, NAME); | 482 LuaFunctionCall call(lua_, NAME); |
483 call.PushJson(simplified); | 483 call.PushJson(simplified); |
484 call.PushString(remoteAet); | 484 |
485 Json::Value origin; | |
486 instance.GetOriginInformation(origin); | |
487 call.PushJson(origin); | |
485 | 488 |
486 if (!call.ExecutePredicate()) | 489 if (!call.ExecutePredicate()) |
487 { | 490 { |
488 return false; | 491 return false; |
489 } | 492 } |