Mercurial > hg > orthanc

comparison OrthancServer/ServerContext.h @ 1124:790ff7a5b3bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
IStorageArea abstraction
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 05 Sep 2014 16:28:34 +0200
parents 6c5a77637b23
children bf67431a7383
comparison
equal deleted inserted replaced
1123:6c5a77637b23 1124:790ff7a5b3bf
32 32
33 #pragma once 33 #pragma once
34 34
35 #include "../Core/Cache/MemoryCache.h" 35 #include "../Core/Cache/MemoryCache.h"
36 #include "../Core/FileStorage/CompressedFileStorageAccessor.h" 36 #include "../Core/FileStorage/CompressedFileStorageAccessor.h"
37 #include "../Core/FileStorage/FilesystemStorage.h" 37 #include "../Core/FileStorage/IStorageArea.h"
38 #include "../Core/RestApi/RestApiOutput.h" 38 #include "../Core/RestApi/RestApiOutput.h"
39 #include "../Core/Lua/LuaContext.h" 39 #include "../Core/Lua/LuaContext.h"
40 #include "ServerIndex.h" 40 #include "ServerIndex.h"
41 #include "ParsedDicomFile.h" 41 #include "ParsedDicomFile.h"
42 #include "DicomProtocol/ReusableDicomUserConnection.h" 42 #include "DicomProtocol/ReusableDicomUserConnection.h"
43 #include "Scheduler/ServerScheduler.h" 43 #include "Scheduler/ServerScheduler.h"
44 #include "DicomInstanceToStore.h" 44 #include "DicomInstanceToStore.h"
45
46 #include <boost/filesystem.hpp>
45 47
46 namespace Orthanc 48 namespace Orthanc
47 { 49 {
48 class PluginsHttpHandler; 50 class PluginsHttpHandler;
49 51
73 75
74 void ApplyLuaOnStoredInstance(const std::string& instanceId, 76 void ApplyLuaOnStoredInstance(const std::string& instanceId,
75 const Json::Value& simplifiedDicom, 77 const Json::Value& simplifiedDicom,
76 const Json::Value& metadata); 78 const Json::Value& metadata);
77 79
78 FilesystemStorage storage_; 80 IStorageArea& storage_;
79 ServerIndex index_; 81 ServerIndex index_;
80 CompressedFileStorageAccessor accessor_; 82 CompressedFileStorageAccessor accessor_;
81 bool compressionEnabled_; 83 bool compressionEnabled_;
82 84
83 DicomCacheProvider provider_; 85 DicomCacheProvider provider_;
130 return that_.lua_; 132 return that_.lua_;
131 } 133 }
132 }; 134 };
133 135
134 136
135 ServerContext(const boost::filesystem::path& storagePath, 137 ServerContext(IStorageArea& storage,
136 const boost::filesystem::path& indexPath); 138 const boost::filesystem::path& indexPath);
137 139
138 ServerIndex& GetIndex() 140 ServerIndex& GetIndex()
139 { 141 {
140 return index_; 142 return index_;