Mercurial > hg > orthanc

diff OrthancServer/Internals/FindScp.cpp @ 1799:4f01c9d73f02 worklists

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
calledAet made available to all the handlers
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 20 Nov 2015 12:57:14 +0100
parents bdcc1dba4a53
children 30e97a1f4093
line wrap: on
line diff
--- a/OrthancServer/Internals/FindScp.cpp	Fri Nov 20 12:00:34 2015 +0100
+++ b/OrthancServer/Internals/FindScp.cpp	Fri Nov 20 12:57:14 2015 +0100
@@ -101,6 +101,7 @@
       DcmDataset* lastRequest_;
       const std::string* remoteIp_;
       const std::string* remoteAet_;
+      const std::string* calledAet_;
       bool noCroppingOfResults_;
     };
 
@@ -135,7 +136,8 @@
             {
               ParsedDicomFile query(*requestIdentifiers);
               data.noCroppingOfResults_ = data.worklistHandler_->Handle(data.answers_, query,
-                                                                        *data.remoteIp_, *data.remoteAet_);
+                                                                        *data.remoteIp_, *data.remoteAet_,
+                                                                        *data.calledAet_);
               ok = true;
             }
             else
@@ -150,7 +152,8 @@
               DicomMap input;
               FromDcmtkBridge::Convert(input, *requestIdentifiers);
               data.noCroppingOfResults_ = data.findHandler_->Handle(data.answers_, input,
-                                                                    *data.remoteIp_, *data.remoteAet_);
+                                                                    *data.remoteIp_, *data.remoteAet_,
+                                                                    *data.calledAet_);
               ok = true;
             }
             else
@@ -211,7 +214,8 @@
                                  IFindRequestHandler* findHandler,
                                  IWorklistRequestHandler* worklistHandler,
                                  const std::string& remoteIp,
-                                 const std::string& remoteAet)
+                                 const std::string& remoteAet,
+                                 const std::string& calledAet)
   {
     FindScpData data;
     data.lastRequest_ = NULL;
@@ -219,6 +223,7 @@
     data.worklistHandler_ = worklistHandler;
     data.remoteIp_ = &remoteIp;
     data.remoteAet_ = &remoteAet;
+    data.calledAet_ = &calledAet;
     data.noCroppingOfResults_ = true;
 
     OFCondition cond = DIMSE_findProvider(assoc, presID, &msg->msg.CFindRQ,