Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi.cpp @ 232:5368bbe813cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring of attachments
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 30 Nov 2012 14:22:27 +0100
parents 8098448bd827
children c11273198cef
comparison
equal deleted inserted replaced
231:8098448bd827 232:5368bbe813cf
256 256
257 for (Json::Value::ArrayIndex i = 0; i < found["Instances"].size(); i++) 257 for (Json::Value::ArrayIndex i = 0; i < found["Instances"].size(); i++)
258 { 258 {
259 std::string instanceId = found["Instances"][i].asString(); 259 std::string instanceId = found["Instances"][i].asString();
260 std::string dicom; 260 std::string dicom;
261 context.ReadFile(dicom, instanceId, AttachedFileType_Dicom); 261 context.ReadFile(dicom, instanceId, FileType_Dicom);
262 connection.Store(dicom); 262 connection.Store(dicom);
263 } 263 }
264 264
265 call.GetOutput().AnswerBuffer("{}", "application/json"); 265 call.GetOutput().AnswerBuffer("{}", "application/json");
266 } 266 }
268 { 268 {
269 // The UUID corresponds to an instance 269 // The UUID corresponds to an instance
270 context.GetIndex().LogExportedResource(resourceId, remote); 270 context.GetIndex().LogExportedResource(resourceId, remote);
271 271
272 std::string dicom; 272 std::string dicom;
273 context.ReadFile(dicom, resourceId, AttachedFileType_Dicom); 273 context.ReadFile(dicom, resourceId, FileType_Dicom);
274 connection.Store(dicom); 274 connection.Store(dicom);
275 275
276 call.GetOutput().AnswerBuffer("{}", "application/json"); 276 call.GetOutput().AnswerBuffer("{}", "application/json");
277 } 277 }
278 else 278 else
408 static void GetInstanceFile(RestApi::GetCall& call) 408 static void GetInstanceFile(RestApi::GetCall& call)
409 { 409 {
410 RETRIEVE_CONTEXT(call); 410 RETRIEVE_CONTEXT(call);
411 411
412 std::string publicId = call.GetUriComponent("id", ""); 412 std::string publicId = call.GetUriComponent("id", "");
413 context.AnswerFile(call.GetOutput(), publicId, AttachedFileType_Dicom); 413 context.AnswerFile(call.GetOutput(), publicId, FileType_Dicom);
414 } 414 }
415 415
416 416
417 template <bool simplify> 417 template <bool simplify>
418 static void GetInstanceTags(RestApi::GetCall& call) 418 static void GetInstanceTags(RestApi::GetCall& call)
483 return; 483 return;
484 } 484 }
485 485
486 std::string publicId = call.GetUriComponent("id", ""); 486 std::string publicId = call.GetUriComponent("id", "");
487 std::string dicomContent, png; 487 std::string dicomContent, png;
488 context.ReadFile(dicomContent, publicId, AttachedFileType_Dicom); 488 context.ReadFile(dicomContent, publicId, FileType_Dicom);
489 489
490 try 490 try
491 { 491 {
492 FromDcmtkBridge::ExtractPngImage(png, dicomContent, frame, mode); 492 FromDcmtkBridge::ExtractPngImage(png, dicomContent, frame, mode);
493 call.GetOutput().AnswerBuffer(png, "image/png"); 493 call.GetOutput().AnswerBuffer(png, "image/png");