# HG changeset patch # User Sebastien Jodogne # Date 1779453040 -7200 # Node ID 8e4223cc729d5691099cb4299f98ea94f0c1a696 # Parent 30879dc76b68d8f7687a284bee1f591aaf4aa58d removed StorageAreaDataSource::MultipleReader diff -r 30879dc76b68 -r 8e4223cc729d OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp --- a/OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp Fri May 22 14:29:15 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp Fri May 22 14:30:40 2026 +0200 @@ -489,95 +489,4 @@ return range.release(); } } - - - // TODO-Streaming : REMOVE -#if 0 - class StorageAreaDataSource::MultipleReader::PImpl : public boost::noncopyable - { - private: - boost::shared_ptr reader_; - std::unique_ptr request_; - boost::shared_ptr answer_; - - public: - PImpl(const boost::shared_ptr& reader) : - reader_(reader), - request_(new DataSourceRequest) - { - } - - void Enqueue(const FileInfo& attachment, - bool uncompress) - { - if (request_.get() == NULL) - { - throw OrthancException(ErrorCode_BadSequenceOfCalls); - } - else - { - std::unique_ptr id(new Identifier(attachment.GetUuid(), - attachment.GetContentType(), - 0, attachment.GetCompressedSize(), - attachment.GetCustomData())); - id->SetPostProcessing(new AttachmentPostProcessing(attachment, uncompress)); - - request_->Enqueue(id.release()); - } - } - - Item* Dequeue() - { - if (answer_.get() == NULL) - { - assert(request_.get() != NULL); - answer_ = reader_->Submit(request_.release()); - } - - std::unique_ptr item(answer_->Dequeue()); - - std::unique_ptr range(new Range(item->GetValue())); - - const Identifier& id = dynamic_cast(item->GetId()); - range.reset(range->ApplyPostProcessing(id)); - - const AttachmentPostProcessing& postProcessing = dynamic_cast(id.GetPostProcessing()); - return new Item(range.release(), postProcessing.GetAttachment()); - } - }; - - - StorageAreaDataSource::MultipleReader::Item::Item(Range* range, - const FileInfo& attachment) : - range_(range), - attachment_(attachment) - { - } - - - StorageAreaDataSource::MultipleReader::MultipleReader(const boost::shared_ptr& reader) : - pimpl_(new PImpl(reader)) - { - } - - - StorageAreaDataSource::MultipleReader::~MultipleReader() - { - assert(pimpl_ != NULL); - delete pimpl_; - } - - - void StorageAreaDataSource::MultipleReader::Enqueue(const FileInfo& attachment, - bool uncompress) - { - pimpl_->Enqueue(attachment, uncompress); - } - - - StorageAreaDataSource::MultipleReader::Item* StorageAreaDataSource::MultipleReader::Dequeue() - { - return pimpl_->Dequeue(); - } -#endif } diff -r 30879dc76b68 -r 8e4223cc729d OrthancFramework/Sources/DataSource/StorageAreaDataSource.h --- a/OrthancFramework/Sources/DataSource/StorageAreaDataSource.h Fri May 22 14:29:15 2026 +0200 +++ b/OrthancFramework/Sources/DataSource/StorageAreaDataSource.h Fri May 22 14:30:40 2026 +0200 @@ -116,52 +116,5 @@ static Range* Execute(DataSourceReader& reader, IDataIdentifier* request /* takes ownership */); - - - // TODO-Streaming: Probably to be removed -#if 0 - class MultipleReader : public boost::noncopyable - { - private: - class PImpl; - PImpl* pimpl_; - - public: - class Item : public boost::noncopyable - { - private: - std::unique_ptr range_; - FileInfo attachment_; - - public: - Item(Range* range, - const FileInfo& attachment); - - const void* GetData() const - { - return range_->GetData(); - } - - size_t GetSize() const - { - return range_->GetSize(); - } - - const FileInfo& GetAttachment() const - { - return attachment_; - } - }; - - MultipleReader(const boost::shared_ptr& reader); - - ~MultipleReader(); - - void Enqueue(const FileInfo& item, - bool uncompress); - - Item* Dequeue(); - }; -#endif }; }