Mercurial > hg > orthanc

diff OrthancServer/ServerContext.cpp @ 1574:0c29ebe80ac9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2c7d5eb588e6
children bd1889029cbb
line wrap: on
line diff
--- a/OrthancServer/ServerContext.cpp	Tue Aug 25 13:05:22 2015 +0200
+++ b/OrthancServer/ServerContext.cpp	Tue Aug 25 13:37:57 2015 +0200
@@ -186,8 +186,8 @@
       DicomInstanceHasher hasher(dicom.GetSummary());
       resultPublicId = hasher.HashInstance();
 
-      Json::Value simplified;
-      SimplifyTags(simplified, dicom.GetJson());
+      Json::Value simplifiedTags;
+      SimplifyTags(simplifiedTags, dicom.GetJson());
 
       // Test if the instance must be filtered out
       bool accepted = true;
@@ -199,7 +199,7 @@
         {
           try
           {
-            if (!it->GetListener().FilterIncomingInstance(simplified, dicom.GetRemoteAet()))
+            if (!it->GetListener().FilterIncomingInstance(dicom, simplifiedTags))
             {
               accepted = false;
               break;
@@ -281,7 +281,7 @@
         {
           try
           {
-            it->GetListener().SignalStoredInstance(resultPublicId, dicom, simplified);
+            it->GetListener().SignalStoredInstance(resultPublicId, dicom, simplifiedTags);
           }
           catch (OrthancException& e)
           {