Mercurial > hg > orthanc

changeset 1909:21fcfc428dc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
another semantics for Originator Message ID
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 13 Jan 2016 15:15:51 +0100
parents 5096681efce6
children c32a8fab4fc4
files OrthancServer/DicomProtocol/IMoveRequestHandler.h OrthancServer/Internals/MoveScp.cpp OrthancServer/OrthancMoveRequestHandler.cpp OrthancServer/OrthancMoveRequestHandler.h
diffstat 4 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/DicomProtocol/IMoveRequestHandler.h	Thu Jan 07 11:36:47 2016 +0100
+++ b/OrthancServer/DicomProtocol/IMoveRequestHandler.h	Wed Jan 13 15:15:51 2016 +0100
@@ -71,7 +71,8 @@
                                          const DicomMap& input,
                                          const std::string& remoteIp,
                                          const std::string& remoteAet,
-                                         const std::string& calledAet) = 0;
+                                         const std::string& calledAet,
+                                         uint16_t messageId) = 0;
   };
 
 }
--- a/OrthancServer/Internals/MoveScp.cpp	Thu Jan 07 11:36:47 2016 +0100
+++ b/OrthancServer/Internals/MoveScp.cpp	Wed Jan 13 15:15:51 2016 +0100
@@ -135,7 +135,7 @@
         {
           data.iterator_.reset(data.handler_->Handle(data.target_, input,
                                                      *data.remoteIp_, *data.remoteAet_,
-                                                     *data.calledAet_));
+                                                     *data.calledAet_, request->MessageID));
 
           if (data.iterator_.get() == NULL)
           {
--- a/OrthancServer/OrthancMoveRequestHandler.cpp	Thu Jan 07 11:36:47 2016 +0100
+++ b/OrthancServer/OrthancMoveRequestHandler.cpp	Wed Jan 13 15:15:51 2016 +0100
@@ -169,7 +169,8 @@
                                                           const DicomMap& input,
                                                           const std::string& remoteIp,
                                                           const std::string& remoteAet,
-                                                          const std::string& calledAet)
+                                                          const std::string& calledAet,
+                                                          uint16_t messageId)
   {
     LOG(WARNING) << "Move-SCU request received for AET \"" << targetAet << "\"";
 
@@ -187,6 +188,7 @@
     }
 
 
+#if 0
     /**
      * Retrieve the Message ID (0000,0110) for this C-MOVE request, if
      * any. If present, this Message ID will be stored in the Move
@@ -197,7 +199,7 @@
     static const DicomTag MESSAGE_ID(0x0000, 0x0110);
     const DicomValue* messageIdTmp = input.TestAndGetValue(MESSAGE_ID);
 
-    uint16_t messageId = 0;
+    messageId = 0;
 
     if (messageIdTmp != NULL &&
         !messageIdTmp->IsNull() &&
@@ -213,6 +215,7 @@
                      << "\") of an incoming C-MOVE request to an integer, assuming zero";
       }
     }
+#endif
 
 
     /**
--- a/OrthancServer/OrthancMoveRequestHandler.h	Thu Jan 07 11:36:47 2016 +0100
+++ b/OrthancServer/OrthancMoveRequestHandler.h	Wed Jan 13 15:15:51 2016 +0100
@@ -55,6 +55,7 @@
                                          const DicomMap& input,
                                          const std::string& remoteIp,
                                          const std::string& remoteAet,
-                                         const std::string& calledAet);
+                                         const std::string& calledAet,
+                                         uint16_t messageId);
   };
 }