Mercurial > hg > orthanc
diff OrthancServer/ServerContext.cpp @ 2124:2b1520efa282
cleaning up
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 07 Nov 2016 12:11:34 +0100 |
parents | 2ecc95a239f7 |
children | bfa92c9328d7 |
line wrap: on
line diff
--- a/OrthancServer/ServerContext.cpp Mon Nov 07 11:51:40 2016 +0100 +++ b/OrthancServer/ServerContext.cpp Mon Nov 07 12:11:34 2016 +0100 @@ -368,11 +368,11 @@ } - void ServerContext::ReadJson(Json::Value& result, - const std::string& instancePublicId) + void ServerContext::ReadDicomAsJson(Json::Value& result, + const std::string& instancePublicId) { std::string s; - ReadFile(s, instancePublicId, FileContentType_DicomAsJson); + ReadFile(s, instancePublicId, FileContentType_DicomAsJson, true /* decompress if needed */); Json::Reader reader; if (!reader.parse(s, result)) @@ -418,7 +418,7 @@ IDynamicObject* ServerContext::DicomCacheProvider::Provide(const std::string& instancePublicId) { std::string content; - context_.ReadFile(content, instancePublicId, FileContentType_Dicom); + context_.ReadDicom(content, instancePublicId); return new ParsedDicomFile(content); } @@ -567,7 +567,7 @@ for (size_t i = 0; i < instances.size(); i++) { Json::Value dicom; - ReadJson(dicom, instances[i]); + ReadDicomAsJson(dicom, instances[i]); if (lookup.IsMatch(dicom)) {