comparison OrthancServer/ServerIndex.h @ 187:8e673a65564d

refactoring of storing new instances
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 12 Nov 2012 17:29:11 +0100
parents f68c039b0571
children b6cef9d45cc3
comparison
equal deleted inserted replaced
186:f68c039b0571 187:8e673a65564d
94 void CreateInstance(DicomInstanceHasher& hasher, 94 void CreateInstance(DicomInstanceHasher& hasher,
95 const DicomMap& dicomSummary, 95 const DicomMap& dicomSummary,
96 const std::string& fileUuid, 96 const std::string& fileUuid,
97 uint64_t fileSize, 97 uint64_t fileSize,
98 const std::string& jsonUuid, 98 const std::string& jsonUuid,
99 const std::string& distantAet); 99 const std::string& remoteAet);
100 100
101 101
102 102
103 void RecordChange(const std::string& resourceType, 103 void RecordChange(const std::string& resourceType,
104 const std::string& uuid); 104 const std::string& uuid);
113 113
114 bool DeleteInternal(Json::Value& target, 114 bool DeleteInternal(Json::Value& target,
115 const std::string& uuid, 115 const std::string& uuid,
116 const std::string& tableName); 116 const std::string& tableName);
117 117
118 StoreStatus Store2(const DicomMap& dicomSummary,
119 const std::string& fileUuid,
120 uint64_t uncompressedFileSize,
121 const std::string& jsonUuid,
122 const std::string& remoteAet);
123
118 public: 124 public:
119 ServerIndex(const std::string& storagePath); 125 ServerIndex(const std::string& storagePath);
120 126
121 StoreStatus Store(std::string& instanceUuid, 127 StoreStatus Store(const DicomMap& dicomSummary,
122 const DicomMap& dicomSummary,
123 const std::string& fileUuid, 128 const std::string& fileUuid,
124 uint64_t uncompressedFileSize, 129 uint64_t uncompressedFileSize,
125 const std::string& jsonUuid, 130 const std::string& jsonUuid,
126 const std::string& distantAet); 131 const std::string& remoteAet);
127 132
128 StoreStatus Store(std::string& instanceUuid, 133 StoreStatus Store(FileStorage& storage,
129 FileStorage& storage,
130 const char* dicomFile, 134 const char* dicomFile,
131 size_t dicomSize, 135 size_t dicomSize,
132 const DicomMap& dicomSummary, 136 const DicomMap& dicomSummary,
133 const Json::Value& dicomJson, 137 const Json::Value& dicomJson,
134 const std::string& distantAet); 138 const std::string& remoteAet);
135 139
136 uint64_t GetTotalSize(); 140 uint64_t GetTotalCompressedSize();
141
142 uint64_t GetTotalUncompressedSize();
137 143
138 SeriesStatus GetSeriesStatus(const std::string& seriesUuid); 144 SeriesStatus GetSeriesStatus(const std::string& seriesUuid);
139 145
140 146
141 bool GetInstance(Json::Value& result, 147 bool GetInstance(Json::Value& result,