Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi.cpp @ 193:a1b9d1e1497b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
failed attempt to compile with linux standard base
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 13 Nov 2012 14:02:28 +0100
parents c56dc32266e0
children 530a25320461
comparison
equal deleted inserted replaced
192:c56dc32266e0 193:a1b9d1e1497b
566 uri[0] == "instances" && 566 uri[0] == "instances" &&
567 (uri[2] == "file" || 567 (uri[2] == "file" ||
568 uri[2] == "tags" || 568 uri[2] == "tags" ||
569 uri[2] == "simplified-tags")) 569 uri[2] == "simplified-tags"))
570 { 570 {
571 CompressionType compressionType;
571 std::string fileUuid, contentType, filename; 572 std::string fileUuid, contentType, filename;
572 if (uri[2] == "file") 573 if (uri[2] == "file")
573 { 574 {
574 existingResource = index_.GetFile(fileUuid, uri[1], "dicom"); 575 existingResource = index_.GetFile(fileUuid, compressionType, uri[1], "dicom");
575 contentType = "application/dicom"; 576 contentType = "application/dicom";
576 filename = fileUuid + ".dcm"; 577 filename = fileUuid + ".dcm";
577 } 578 }
578 else if (uri[2] == "tags" || 579 else if (uri[2] == "tags" ||
579 uri[2] == "simplified-tags") 580 uri[2] == "simplified-tags")
580 { 581 {
581 existingResource = index_.GetFile(fileUuid, uri[1], "json"); 582 existingResource = index_.GetFile(fileUuid, compressionType, uri[1], "json");
582 contentType = "application/json"; 583 contentType = "application/json";
583 filename = fileUuid + ".json"; 584 filename = fileUuid + ".json";
584 } 585 }
585 586
586 if (existingResource) 587 if (existingResource)
640 (uri[4] == "preview" || 641 (uri[4] == "preview" ||
641 uri[4] == "image-uint8" || 642 uri[4] == "image-uint8" ||
642 uri[4] == "image-uint16")))) 643 uri[4] == "image-uint16"))))
643 { 644 {
644 std::string uuid; 645 std::string uuid;
645 existingResource = index_.GetFile(uuid, uri[1], "dicom"); 646 CompressionType compressionType;
647 existingResource = index_.GetFile(uuid, compressionType, uri[1], "dicom");
646 648
647 std::string action = uri[2]; 649 std::string action = uri[2];
648 650
649 unsigned int frame = 0; 651 unsigned int frame = 0;
650 if (existingResource && 652 if (existingResource &&