changeset 6851:8e4223cc729d streaming

removed StorageAreaDataSource::MultipleReader
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 22 May 2026 14:30:40 +0200
parents 30879dc76b68
children 0b6aa04bca59
files OrthancFramework/Sources/DataSource/StorageAreaDataSource.cpp OrthancFramework/Sources/DataSource/StorageAreaDataSource.h
diffstat 2 files changed, 0 insertions(+), 138 deletions(-) [+]
line wrap: on
line diff
--- 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<DataSourceReader>  reader_;
-    std::unique_ptr<DataSourceRequest>   request_;
-    boost::shared_ptr<DataSourceAnswer>  answer_;
-
-  public:
-    PImpl(const boost::shared_ptr<DataSourceReader>& 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<Identifier> 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<DataSourceAnswer::Item> item(answer_->Dequeue());
-
-      std::unique_ptr<StorageAreaDataSource::Range> range(new Range(item->GetValue()));
-
-      const Identifier& id = dynamic_cast<const Identifier&>(item->GetId());
-      range.reset(range->ApplyPostProcessing(id));
-
-      const AttachmentPostProcessing& postProcessing = dynamic_cast<const AttachmentPostProcessing&>(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<DataSourceReader>& 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
 }
--- 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>  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<DataSourceReader>& reader);
-
-      ~MultipleReader();
-
-      void Enqueue(const FileInfo& item,
-                   bool uncompress);
-
-      Item* Dequeue();
-    };
-#endif
   };
 }