Mercurial > hg > orthanc
diff OrthancServer/ServerContext.cpp @ 233:c11273198cef
rename
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 30 Nov 2012 14:30:05 +0100 |
parents | 5368bbe813cf |
children | 6d9be2b470b4 |
line wrap: on
line diff
--- a/OrthancServer/ServerContext.cpp Fri Nov 30 14:22:27 2012 +0100 +++ b/OrthancServer/ServerContext.cpp Fri Nov 30 14:30:05 2012 +0100 @@ -68,8 +68,8 @@ { //accessor_.SetCompressionForNextOperations(CompressionType_Zlib); - FileInfo dicomInfo = accessor_.Write(dicomFile, dicomSize, FileType_Dicom); - FileInfo jsonInfo = accessor_.Write(dicomJson.toStyledString(), FileType_Json); + FileInfo dicomInfo = accessor_.Write(dicomFile, dicomSize, FileContentType_Dicom); + FileInfo jsonInfo = accessor_.Write(dicomJson.toStyledString(), FileContentType_Json); ServerIndex::Attachments attachments; attachments.push_back(dicomInfo); @@ -104,13 +104,13 @@ void ServerContext::AnswerFile(RestApiOutput& output, const std::string& instancePublicId, - FileType content) + FileContentType content) { FileInfo attachment; - if (index_.LookupAttachment(attachment, instancePublicId, FileType_Dicom)) + if (index_.LookupAttachment(attachment, instancePublicId, FileContentType_Dicom)) { assert(attachment.GetCompressionType() == CompressionType_None); - assert(attachment.GetFileType() == FileType_Dicom); + assert(attachment.GetContentType() == FileContentType_Dicom); FilesystemHttpSender sender(storage_, attachment.GetUuid()); sender.SetDownloadFilename(attachment.GetUuid() + ".dcm"); @@ -124,7 +124,7 @@ const std::string& instancePublicId) { std::string s; - ReadFile(s, instancePublicId, FileType_Json); + ReadFile(s, instancePublicId, FileContentType_Json); Json::Reader reader; if (!reader.parse(s, result)) @@ -136,7 +136,7 @@ void ServerContext::ReadFile(std::string& result, const std::string& instancePublicId, - FileType content) + FileContentType content) { FileInfo attachment; if (!index_.LookupAttachment(attachment, instancePublicId, content))