Mercurial > hg > orthanc
diff OrthancServer/ServerContext.h @ 1549:e5e975e9b738
refactoring and simplification of StorageAccessor
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 17 Aug 2015 10:47:04 +0200 |
parents | 68827c07e683 |
children | eb8fbcf008b5 |
line wrap: on
line diff
--- a/OrthancServer/ServerContext.h Fri Aug 14 11:52:03 2015 +0200 +++ b/OrthancServer/ServerContext.h Mon Aug 17 10:47:04 2015 +0200 @@ -35,7 +35,6 @@ #include "../Core/MultiThreading/SharedMessageQueue.h" #include "../Core/Cache/MemoryCache.h" #include "../Core/Cache/SharedArchive.h" -#include "../Core/FileStorage/CompressedFileStorageAccessor.h" #include "../Core/FileStorage/IStorageArea.h" #include "../Core/Lua/LuaContext.h" #include "../Core/RestApi/RestApiOutput.h" @@ -108,8 +107,10 @@ ServerIndex index_; - CompressedFileStorageAccessor accessor_; + IStorageArea& area_; + bool compressionEnabled_; + bool storeMD5_; DicomCacheProvider provider_; boost::mutex dicomCacheMutex_; @@ -150,15 +151,11 @@ } }; - ServerContext(IDatabaseWrapper& database); + ServerContext(IDatabaseWrapper& database, + IStorageArea& area); ~ServerContext(); - void SetStorageArea(IStorageArea& storage) - { - accessor_.SetStorageArea(storage); - } - ServerIndex& GetIndex() { return index_; @@ -199,7 +196,7 @@ bool IsStoreMD5ForAttachments() const { - return accessor_.IsStoreMD5(); + return storeMD5_; } ReusableDicomUserConnection& GetReusableDicomUserConnection()