Mercurial > hg > orthanc
diff OrthancServer/LuaScripting.cpp @ 1572:904096e7367e
More information about the origin request in OnStoredInstance() callbacks
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 25 Aug 2015 12:10:12 +0200 |
| parents | 3232f1c995a5 |
| children | 0c29ebe80ac9 |
line wrap: on
line diff
--- a/OrthancServer/LuaScripting.cpp Tue Aug 25 11:04:19 2015 +0200 +++ b/OrthancServer/LuaScripting.cpp Tue Aug 25 12:10:12 2015 +0200 @@ -245,7 +245,7 @@ DicomModification modification; OrthancRestApi::ParseModifyRequest(modification, parameters); - std::auto_ptr<ModifyInstanceCommand> command(new ModifyInstanceCommand(context_, modification)); + std::auto_ptr<ModifyInstanceCommand> command(new ModifyInstanceCommand(context_, RequestOrigin_Lua, modification)); return command.release(); } @@ -366,8 +366,7 @@ void LuaScripting::ApplyOnStoredInstance(const std::string& instanceId, const Json::Value& simplifiedTags, const Json::Value& metadata, - const std::string& remoteAet, - const std::string& calledAet) + const DicomInstanceToStore& instance) { static const char* NAME = "OnStoredInstance"; @@ -379,8 +378,11 @@ call.PushString(instanceId); call.PushJson(simplifiedTags); call.PushJson(metadata); - call.PushJson(remoteAet); - call.PushJson(calledAet); + + Json::Value origin; + instance.GetOriginInformation(origin); + call.PushJson(origin); + call.Execute(); SubmitJob(std::string("Lua script: ") + NAME); @@ -406,8 +408,7 @@ } } - ApplyOnStoredInstance(publicId, simplifiedTags, metadata, - instance.GetRemoteAet(), instance.GetCalledAet()); + ApplyOnStoredInstance(publicId, simplifiedTags, metadata, instance); }