Mercurial > hg > orthanc
comparison 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 |
comparison
equal
deleted
inserted
replaced
1548:e9325f3ac496 | 1549:e5e975e9b738 |
---|---|
33 #pragma once | 33 #pragma once |
34 | 34 |
35 #include "../Core/MultiThreading/SharedMessageQueue.h" | 35 #include "../Core/MultiThreading/SharedMessageQueue.h" |
36 #include "../Core/Cache/MemoryCache.h" | 36 #include "../Core/Cache/MemoryCache.h" |
37 #include "../Core/Cache/SharedArchive.h" | 37 #include "../Core/Cache/SharedArchive.h" |
38 #include "../Core/FileStorage/CompressedFileStorageAccessor.h" | |
39 #include "../Core/FileStorage/IStorageArea.h" | 38 #include "../Core/FileStorage/IStorageArea.h" |
40 #include "../Core/Lua/LuaContext.h" | 39 #include "../Core/Lua/LuaContext.h" |
41 #include "../Core/RestApi/RestApiOutput.h" | 40 #include "../Core/RestApi/RestApiOutput.h" |
42 #include "../Plugins/Engine/OrthancPlugins.h" | 41 #include "../Plugins/Engine/OrthancPlugins.h" |
43 #include "DicomInstanceToStore.h" | 42 #include "DicomInstanceToStore.h" |
106 | 105 |
107 static void ChangeThread(ServerContext* that); | 106 static void ChangeThread(ServerContext* that); |
108 | 107 |
109 | 108 |
110 ServerIndex index_; | 109 ServerIndex index_; |
111 CompressedFileStorageAccessor accessor_; | 110 IStorageArea& area_; |
111 | |
112 bool compressionEnabled_; | 112 bool compressionEnabled_; |
113 bool storeMD5_; | |
113 | 114 |
114 DicomCacheProvider provider_; | 115 DicomCacheProvider provider_; |
115 boost::mutex dicomCacheMutex_; | 116 boost::mutex dicomCacheMutex_; |
116 MemoryCache dicomCache_; | 117 MemoryCache dicomCache_; |
117 ReusableDicomUserConnection scu_; | 118 ReusableDicomUserConnection scu_; |
148 { | 149 { |
149 return *dicom_; | 150 return *dicom_; |
150 } | 151 } |
151 }; | 152 }; |
152 | 153 |
153 ServerContext(IDatabaseWrapper& database); | 154 ServerContext(IDatabaseWrapper& database, |
155 IStorageArea& area); | |
154 | 156 |
155 ~ServerContext(); | 157 ~ServerContext(); |
156 | |
157 void SetStorageArea(IStorageArea& storage) | |
158 { | |
159 accessor_.SetStorageArea(storage); | |
160 } | |
161 | 158 |
162 ServerIndex& GetIndex() | 159 ServerIndex& GetIndex() |
163 { | 160 { |
164 return index_; | 161 return index_; |
165 } | 162 } |
197 | 194 |
198 void SetStoreMD5ForAttachments(bool storeMD5); | 195 void SetStoreMD5ForAttachments(bool storeMD5); |
199 | 196 |
200 bool IsStoreMD5ForAttachments() const | 197 bool IsStoreMD5ForAttachments() const |
201 { | 198 { |
202 return accessor_.IsStoreMD5(); | 199 return storeMD5_; |
203 } | 200 } |
204 | 201 |
205 ReusableDicomUserConnection& GetReusableDicomUserConnection() | 202 ReusableDicomUserConnection& GetReusableDicomUserConnection() |
206 { | 203 { |
207 return scu_; | 204 return scu_; |