comparison OrthancServer/ServerIndex.h @ 201:bee20e978835

refactoring of delete
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 27 Nov 2012 17:36:19 +0100
parents 9c58b2b03cf0
children 1650557bd81a
comparison
equal deleted inserted replaced
200:9c58b2b03cf0 201:bee20e978835
45 namespace Orthanc 45 namespace Orthanc
46 { 46 {
47 namespace Internals 47 namespace Internals
48 { 48 {
49 class SignalDeletedLevelFunction; 49 class SignalDeletedLevelFunction;
50 class ServerIndexListenerTodo;
50 } 51 }
51 52
52 53
53 class ServerIndex 54 class ServerIndex
54 { 55 {
55 private: 56 private:
56 SQLite::Connection db_; 57 SQLite::Connection db_;
57 boost::mutex mutex_; 58 boost::mutex mutex_;
58 59
59 std::auto_ptr<IServerIndexListener> listener2_; 60 std::auto_ptr<Internals::ServerIndexListenerTodo> listener2_;
60 std::auto_ptr<DatabaseWrapper> db2_; 61 std::auto_ptr<DatabaseWrapper> db2_;
61 62
62 // DO NOT delete the following one, SQLite::Connection will do it automatically 63 // DO NOT delete the following one, SQLite::Connection will do it automatically
63 Internals::SignalDeletedLevelFunction* deletedLevels_; 64 Internals::SignalDeletedLevelFunction* deletedLevels_;
64 65
112 ResourceType expectedType); 113 ResourceType expectedType);
113 114
114 SeriesStatus GetSeriesStatus(int id); 115 SeriesStatus GetSeriesStatus(int id);
115 116
116 public: 117 public:
117 ServerIndex(const std::string& storagePath); 118 ServerIndex(FileStorage& fileStorage,
119 const std::string& dbPath);
118 120
119 StoreStatus Store(const DicomMap& dicomSummary, 121 StoreStatus Store(const DicomMap& dicomSummary,
120 const std::string& fileUuid, 122 const std::string& fileUuid,
121 uint64_t uncompressedFileSize, 123 uint64_t uncompressedFileSize,
122 const std::string& jsonUuid, 124 const std::string& jsonUuid,