Mercurial > hg > orthanc
diff OrthancServer/Sources/OrthancGetRequestHandler.h @ 4258:6f5d4bfb2c90
C-GET SCP: Fix responses and handling of cancel
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 26 Oct 2020 12:23:36 +0100 |
parents | c046d559edb3 |
children | d9473bd5ed43 |
line wrap: on
line diff
--- a/OrthancServer/Sources/OrthancGetRequestHandler.h Tue Oct 20 09:52:42 2020 +0200 +++ b/OrthancServer/Sources/OrthancGetRequestHandler.h Mon Oct 26 12:23:36 2020 +0100 @@ -56,26 +56,22 @@ RemoteModalityParameters remote_; std::string originatorAet_; - unsigned int nRemaining_; - unsigned int nCompleted_; + unsigned int completedCount_; unsigned int warningCount_; - unsigned int nFailed_; + unsigned int failedCount_; std::string failedUIDs_; - DIC_US origMsgId_; - T_ASC_PresentationContextID origPresId_; - - bool getCancelled_; uint32_t timeout_; bool LookupIdentifiers(std::list<std::string>& publicIds, ResourceType level, const DicomMap& input) const; - Status PerformGetSubOp(T_ASC_Association *assoc, - const std::string& sopClassUid, - const std::string& sopInstanceUid, - DcmFileFormat* datasetRaw); + // Returns "false" iff cancel + bool PerformGetSubOp(T_ASC_Association *assoc, + const std::string& sopClassUid, + const std::string& sopInstanceUid, + DcmFileFormat* datasetRaw); void AddFailedUIDInstance(const std::string& sopInstance); @@ -87,22 +83,17 @@ const std::string& originatorAet, const std::string& calledAet, uint32_t timeout) ORTHANC_OVERRIDE; - - virtual Status DoNext(T_ASC_Association *assoc) ORTHANC_OVERRIDE; + + virtual bool DoNext(T_ASC_Association *assoc) ORTHANC_OVERRIDE; virtual unsigned int GetSubOperationCount() const ORTHANC_OVERRIDE { return static_cast<unsigned int>(instances_.size()); } - virtual unsigned int GetRemainingCount() const ORTHANC_OVERRIDE - { - return nRemaining_; - } - virtual unsigned int GetCompletedCount() const ORTHANC_OVERRIDE { - return nCompleted_; + return completedCount_; } virtual unsigned int GetWarningCount() const ORTHANC_OVERRIDE @@ -112,7 +103,7 @@ virtual unsigned int GetFailedCount() const ORTHANC_OVERRIDE { - return nFailed_; + return failedCount_; } virtual const std::string& GetFailedUids() const ORTHANC_OVERRIDE