Mercurial > hg > orthanc
diff OrthancServer/ServerIndex.h @ 200:9c58b2b03cf0
refactoring of read operations
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 27 Nov 2012 16:49:22 +0100 |
parents | dfa2899d9960 |
children | bee20e978835 |
line wrap: on
line diff
--- a/OrthancServer/ServerIndex.h Tue Nov 27 16:20:22 2012 +0100 +++ b/OrthancServer/ServerIndex.h Tue Nov 27 16:49:22 2012 +0100 @@ -65,15 +65,6 @@ void StoreMainDicomTags(const std::string& uuid, const DicomMap& map); - bool GetMainDicomStringTag(std::string& result, - const std::string& uuid, - const DicomTag& tag); - - bool GetMainDicomIntTag(int& result, - const std::string& uuid, - const DicomTag& tag); - - bool HasPatient(DicomInstanceHasher& hasher); void CreatePatient(DicomInstanceHasher& hasher, @@ -103,12 +94,6 @@ void RemoveInstance(const std::string& uuid); - void GetMainDicomTags(DicomMap& map, - const std::string& uuid); - - void MainDicomTagsToJson(Json::Value& target, - const std::string& uuid); - void MainDicomTagsToJson2(Json::Value& result, int64_t resourceId); @@ -128,8 +113,6 @@ SeriesStatus GetSeriesStatus(int id); - SeriesStatus GetSeriesStatus(const std::string& seriesUuid); - public: ServerIndex(const std::string& storagePath); @@ -150,18 +133,31 @@ uint64_t GetTotalUncompressedSize(); - bool GetInstance(Json::Value& result, - const std::string& instanceUuid); + const std::string& instanceUuid) + { + return LookupResource(result, instanceUuid, ResourceType_Instance); + } bool GetSeries(Json::Value& result, - const std::string& seriesUuid); + const std::string& seriesUuid) + { + return LookupResource(result, seriesUuid, ResourceType_Series); + } + bool GetStudy(Json::Value& result, - const std::string& studyUuid); + const std::string& studyUuid) + { + return LookupResource(result, studyUuid, ResourceType_Study); + } + bool GetPatient(Json::Value& result, - const std::string& patientUuid); + const std::string& patientUuid) + { + return LookupResource(result, patientUuid, ResourceType_Patient); + } bool GetFile(std::string& fileUuid, CompressionType& compressionType, @@ -199,9 +195,5 @@ int64_t since, const std::string& filter, unsigned int maxResults); - - /*bool GetAllInstances(std::list<std::string>& instancesUuid, - const std::string& uuid, - bool clear = true);*/ }; }