orthanc: OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp annotate

annotate OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp @ 5596:81a29ad7fb4b find-refactoring

added possibility to retrieve main DICOM tags and metadata at any level

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 07 May 2024 18:44:53 +0200
parents	a87f2a56257d
children	8796c100aaf8

rev	line source
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1860 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1281 diff changeset	4 * Department, University Hospital of Liege, Belgium
5485 48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5467 diff changeset	5 * Copyright (C) 2017-2024 Osimis S.A., Belgium
48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5467 diff changeset	6 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * This program is free software: you can redistribute it and/or
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * modify it under the terms of the GNU General Public License as
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * published by the Free Software Foundation, either version 3 of the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * License, or (at your option) any later version.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * This program is distributed in the hope that it will be useful, but
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * General Public License for more details.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * You should have received a copy of the GNU General Public License
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 **/
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	23 #include "../PrecompiledHeadersServer.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "OrthancRestApi.h"
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	26 #include "../../../OrthancFramework/Sources/Compression/GzipCompressor.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	27 #include "../../../OrthancFramework/Sources/DicomFormat/DicomImageInformation.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	28 #include "../../../OrthancFramework/Sources/DicomParsing/DicomWebJsonVisitor.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	29 #include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	30 #include "../../../OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	31 #include "../../../OrthancFramework/Sources/HttpServer/HttpContentNegociation.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	32 #include "../../../OrthancFramework/Sources/Images/Image.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	33 #include "../../../OrthancFramework/Sources/Images/ImageProcessing.h"
4834 bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	34 #include "../../../OrthancFramework/Sources/Images/NumpyWriter.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	35 #include "../../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	36 #include "../../../OrthancFramework/Sources/MultiThreading/Semaphore.h"
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	37 #include "../../../OrthancFramework/Sources/SerializationToolbox.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	38
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	39 #include "../OrthancConfiguration.h"
3094 61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3085 diff changeset	40 #include "../Search/DatabaseLookup.h"
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1385 diff changeset	41 #include "../ServerContext.h"
2131 bb199bccdc45 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2129 diff changeset	42 #include "../ServerToolbox.h"
1702 9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	43 #include "../SliceOrdering.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
3687 e6d6f8d23d02 fix linking Sebastien Jodogne <s.jodogne@gmail.com> parents: 3686 diff changeset	45 // This "include" is mandatory for Release builds using Linux Standard Base
e6d6f8d23d02 fix linking Sebastien Jodogne <s.jodogne@gmail.com> parents: 3686 diff changeset	46 #include <boost/math/special_functions/round.hpp>
4937 3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	47 #include <boost/shared_ptr.hpp>
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48
3926 2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	49 /**
2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	50 * This semaphore is used to limit the number of concurrent HTTP
2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	51 * requests on CPU-intensive routes of the REST API, in order to
2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	52 * prevent exhaustion of resources (new in Orthanc 1.7.0).
2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	53 **/
2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	54 static Orthanc::Semaphore throttlingSemaphore_(4); // TODO => PARAMETER?
2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	55
2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	56
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	57 static const std::string CHECK_REVISIONS = "CheckRevisions";
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	58
4722 2b4da0ee6b73 added missing documentation of "ignore-length" in "/instances/{id}/tags" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4716 diff changeset	59 static const char* const IGNORE_LENGTH = "ignore-length";
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	60 static const char* const RECONSTRUCT_FILES = "ReconstructFiles";
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	61 static const char* const LIMIT_TO_THIS_LEVEL_MAIN_DICOM_TAGS = "LimitToThisLevelMainDicomTags";
4722 2b4da0ee6b73 added missing documentation of "ignore-length" in "/instances/{id}/tags" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4716 diff changeset	62
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	63
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 namespace Orthanc
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 {
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	66 static std::string GetDocumentationSampleResource(ResourceType type)
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	67 {
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	68 switch (type)
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	69 {
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	70 case Orthanc::ResourceType_Instance:
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	71 return "https://orthanc.uclouvain.be/demo/instances/6582b1c0-292ad5ab-ba0f088f-f7a1766f-9a29a54f";
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	72 break;
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	73
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	74 case Orthanc::ResourceType_Series:
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	75 return "https://orthanc.uclouvain.be/demo/series/37836232-d13a2350-fa1dedc5-962b31aa-010f8e52";
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	76 break;
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	77
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	78 case Orthanc::ResourceType_Study:
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	79 return "https://orthanc.uclouvain.be/demo/studies/27f7126f-4f66fb14-03f4081b-f9341db2-53925988";
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	80 break;
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	81
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	82 case Orthanc::ResourceType_Patient:
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	83 return "https://orthanc.uclouvain.be/demo/patients/46e6332c-677825b6-202fcf7c-f787bc5f-7b07c382";
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	84 break;
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	85
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	86 default:
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	87 throw OrthancException(ErrorCode_ParameterOutOfRange);
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	88 }
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	89 }
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	90
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	91
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	92 static void AnswerDicomAsJson(RestApiCall& call,
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	93 const Json::Value& dicom,
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	94 DicomToJsonFormat mode)
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	95 {
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	96 if (mode != DicomToJsonFormat_Full)
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	97 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	98 Json::Value simplified;
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	99 Toolbox::SimplifyDicomAsJson(simplified, dicom, mode);
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	100 call.GetOutput().AnswerJson(simplified);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	101 }
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	102 else
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	103 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	104 call.GetOutput().AnswerJson(dicom);
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	105 }
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	106 }
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	107
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	108
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	109 static void ParseSetOfTags(std::set<DicomTag>& target,
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	110 const RestApiGetCall& call,
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	111 const std::string& argument)
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	112 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	113 target.clear();
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	114
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	115 if (call.HasArgument(argument))
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	116 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	117 std::vector<std::string> tags;
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	118 Toolbox::TokenizeString(tags, call.GetArgument(argument, ""), ',');
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	119
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	120 for (size_t i = 0; i < tags.size(); i++)
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	121 {
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	122 target.insert(FromDcmtkBridge::ParseTag(tags[i]));
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	123 }
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	124 }
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	125 }
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	126
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	127
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 // List all the patients, studies, series or instances ----------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	130 static void AnswerListOfResources1(RestApiOutput& output,
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	131 ServerContext& context,
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	132 const std::list<std::string>& resources,
4937 3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	133 const std::map<std::string, std::string>& instancesIds, // optional: the id of an instance for each found resource.
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	134 const std::map<std::string, boost::shared_ptr<DicomMap> >& resourcesMainDicomTags, // optional: all tags read from DB for a resource (current level and upper levels)
5060 e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	135 const std::map<std::string, boost::shared_ptr<Json::Value> >& resourcesDicomAsJson, // optional: the dicom-as-json for each resource
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	136 ResourceType level,
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	137 bool expand,
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	138 DicomToJsonFormat format,
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	139 const std::set<DicomTag>& requestedTags,
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	140 bool allowStorageAccess)
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	141 {
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	142 Json::Value answer = Json::arrayValue;
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	143
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	144 for (std::list<std::string>::const_iterator
1384 d6971e18a324 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1374 diff changeset	145 resource = resources.begin(); resource != resources.end(); ++resource)
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	146 {
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	147 if (expand)
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	148 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	149 Json::Value expanded;
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	150
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	151 std::map<std::string, std::string>::const_iterator instanceId = instancesIds.find(*resource);
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	152 if (instanceId != instancesIds.end()) // if it is found in instancesIds, it is also in resourcesDicomAsJson and mainDicomTags
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	153 {
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	154 // reuse data already collected before (e.g during lookup)
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	155 std::map<std::string, boost::shared_ptr<DicomMap> >::const_iterator mainDicomTags = resourcesMainDicomTags.find(*resource);
5060 e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	156 std::map<std::string, boost::shared_ptr<Json::Value> >::const_iterator dicomAsJson = resourcesDicomAsJson.find(*resource);
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	157
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	158 context.ExpandResource(expanded, *resource,
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	159 *(mainDicomTags->second.get()),
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	160 instanceId->second,
5060 e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	161 dicomAsJson->second.get(),
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	162 level, format, requestedTags, allowStorageAccess);
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	163 }
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	164 else
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	165 {
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	166 context.ExpandResource(expanded, *resource, level, format, requestedTags, allowStorageAccess);
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	167 }
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	168
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	169 if (expanded.type() == Json::objectValue)
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	170 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	171 answer.append(expanded);
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	172 }
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	173 }
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	174 else
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	175 {
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	176 answer.append(*resource);
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	177 }
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	178 }
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	179
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	180 output.AnswerJson(answer);
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	181 }
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	182
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	183
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	184 static void AnswerListOfResources2(RestApiOutput& output,
4937 3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	185 ServerContext& context,
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	186 const std::list<std::string>& resources,
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	187 ResourceType level,
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	188 bool expand,
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	189 DicomToJsonFormat format,
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	190 const std::set<DicomTag>& requestedTags,
d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	191 bool allowStorageAccess)
4937 3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	192 {
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	193 std::map<std::string, std::string> unusedInstancesIds;
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	194 std::map<std::string, boost::shared_ptr<DicomMap> > unusedResourcesMainDicomTags;
5060 e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	195 std::map<std::string, boost::shared_ptr<Json::Value> > unusedResourcesDicomAsJson;
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	196
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	197 AnswerListOfResources1(output, context, resources, unusedInstancesIds, unusedResourcesMainDicomTags, unusedResourcesDicomAsJson, level, expand, format, requestedTags, allowStorageAccess);
4937 3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	198 }
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	199
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	200
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 template <enum ResourceType resourceType>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	202 static void ListResources(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 {
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	204 if (call.IsDocumentation())
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	205 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	206 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Human);
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	207 OrthancRestApi::DocumentRequestedTags(call);
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	208
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	209 const std::string resources = GetResourceTypeText(resourceType, true /* plural /, false / lower case */);
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	210 call.GetDocumentation()
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	211 .SetTag(GetResourceTypeText(resourceType, true /* plural /, true / upper case */))
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	212 .SetSummary("List the available " + resources)
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	213 .SetDescription("List the Orthanc identifiers of all the available DICOM " + resources)
4403 ad646ff506d0 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4401 diff changeset	214 .SetHttpGetArgument("limit", RestApiCallDocumentation::Type_Number, "Limit the number of results", false)
ad646ff506d0 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4401 diff changeset	215 .SetHttpGetArgument("since", RestApiCallDocumentation::Type_Number, "Show only the resources since the provided index", false)
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	216 .SetHttpGetArgument("expand", RestApiCallDocumentation::Type_String,
4403 ad646ff506d0 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4401 diff changeset	217 "If present, retrieve detailed information about the individual " + resources, false)
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	218 .AddAnswerType(MimeType_Json, "JSON array containing either the Orthanc identifiers, or detailed information "
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	219 "about the reported " + resources + " (if `expand` argument is provided)")
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	220 .SetHttpGetSample("https://orthanc.uclouvain.be/demo/" + resources + "?since=0&limit=2", true);
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	221 return;
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	222 }
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	223
1342 9ec7ac03152d "?expand" flag for URIs "/patients", "/studies" and "/series" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1303 diff changeset	224 ServerIndex& index = OrthancRestApi::GetIndex(call);
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	225 ServerContext& context = OrthancRestApi::GetContext(call);
1342 9ec7ac03152d "?expand" flag for URIs "/patients", "/studies" and "/series" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1303 diff changeset	226
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	227 if (true)
1509 0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	228 {
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	229 /**
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	230 * EXPERIMENTAL VERSION
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	231 **/
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	232
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	233 // TODO-FIND: include the FindRequest options parsing in a method (parse from get-arguments and from post payload)
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	234 // TODO-FIND: support other values for expand like expand=MainDicomTags,Labels,Parent,SeriesStatus
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	235 const bool expand = (call.HasArgument("expand") &&
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	236 call.GetBooleanArgument("expand", true));
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	237
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	238 std::set<DicomTag> requestedTags;
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	239 OrthancRestApi::GetRequestedTags(requestedTags, call);
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	240
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	241 const DicomToJsonFormat format = OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Human);
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	242
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	243 FindRequest request(resourceType);
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	244
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	245 if (expand)
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	246 {
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	247 // compatibility with default expand option
5596 81a29ad7fb4b added possibility to retrieve main DICOM tags and metadata at any level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5595 diff changeset	248 request.SetRetrieveMainDicomTags(resourceType, true);
81a29ad7fb4b added possibility to retrieve main DICOM tags and metadata at any level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5595 diff changeset	249 request.SetRetrieveMetadata(resourceType, true);
5590 8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	250 request.SetRetrieveLabels(true);
8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	251
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	252 if (resourceType == ResourceType_Series)
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	253 {
5595 a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	254 request.AddRetrieveChildrenMetadata(MetadataType_Instance_IndexInSeries); // required for the SeriesStatus
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	255 }
5590 8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	256
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	257 if (resourceType == ResourceType_Instance)
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	258 {
5590 8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	259 request.SetRetrieveAttachments(true); // for FileSize & FileUuid
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	260 }
5590 8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	261 else
8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	262 {
8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	263 request.SetRetrieveChildrenIdentifiers(true);
8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	264 }
8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	265
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	266 if (resourceType != ResourceType_Patient)
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	267 {
5590 8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	268 request.SetRetrieveParentIdentifier(true);
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	269 }
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	270 }
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	271
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	272 if (call.HasArgument("limit") \|\|
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	273 call.HasArgument("since"))
1509 0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	274 {
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	275 if (!call.HasArgument("limit"))
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	276 {
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	277 throw OrthancException(ErrorCode_BadRequest,
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	278 "Missing \"limit\" argument for GET request against: " +
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	279 call.FlattenUri());
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	280 }
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	281
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	282 if (!call.HasArgument("since"))
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	283 {
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	284 throw OrthancException(ErrorCode_BadRequest,
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	285 "Missing \"since\" argument for GET request against: " +
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	286 call.FlattenUri());
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	287 }
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	288
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	289 uint64_t since = boost::lexical_cast<uint64_t>(call.GetArgument("since", ""));
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	290 uint64_t limit = boost::lexical_cast<uint64_t>(call.GetArgument("limit", ""));
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	291 request.SetLimits(since, limit);
1509 0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	292 }
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	293
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	294 FindResponse response;
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	295 index.ExecuteFind(response, request);
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	296
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5565 diff changeset	297 // TODO-FIND: put this in an AnswerFindResponse method !
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	298 Json::Value answer = Json::arrayValue;
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	299
5590 8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	300 if (expand)
1509 0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	301 {
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5565 diff changeset	302 for (size_t i = 0; i < response.GetSize(); i++)
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	303 {
5590 8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	304 context.AppendFindResponse(answer, request, response.GetResource(i), format, requestedTags, true /* allowStorageAccess */);
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	305 }
1509 0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	306 }
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5565 diff changeset	307 else
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5565 diff changeset	308 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5565 diff changeset	309 for (size_t i = 0; i < response.GetSize(); i++)
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	310 {
5590 8b32213af23e replaced FindRequest::ResponseContent by booleans Sebastien Jodogne <s.jodogne@gmail.com> parents: 5589 diff changeset	311 answer.append(response.GetResource(i).GetIdentifier());
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	312 }
1509 0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	313 }
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	314
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	315 call.GetOutput().AnswerJson(answer);
1509 0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	316 }
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	317 else
0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	318 {
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	319 /**
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	320 * VERSION IN ORTHANC <= 1.12.3
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	321 **/
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	322
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	323 std::list<std::string> result;
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	324
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	325 std::set<DicomTag> requestedTags;
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	326 OrthancRestApi::GetRequestedTags(requestedTags, call);
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	327
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	328 if (call.HasArgument("limit") \|\|
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	329 call.HasArgument("since"))
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	330 {
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	331 if (!call.HasArgument("limit"))
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	332 {
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	333 throw OrthancException(ErrorCode_BadRequest,
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	334 "Missing \"limit\" argument for GET request against: " +
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	335 call.FlattenUri());
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	336 }
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	337
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	338 if (!call.HasArgument("since"))
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	339 {
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	340 throw OrthancException(ErrorCode_BadRequest,
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	341 "Missing \"since\" argument for GET request against: " +
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	342 call.FlattenUri());
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	343 }
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	344
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	345 size_t since = boost::lexical_cast<size_t>(call.GetArgument("since", ""));
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	346 size_t limit = boost::lexical_cast<size_t>(call.GetArgument("limit", ""));
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	347 index.GetAllUuids(result, resourceType, since, limit);
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	348 }
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	349 else
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	350 {
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	351 index.GetAllUuids(result, resourceType);
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	352 }
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	353
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	354 AnswerListOfResources2(call.GetOutput(), context, result, resourceType, call.HasArgument("expand") && call.GetBooleanArgument("expand", true),
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	355 OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Human),
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	356 requestedTags,
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	357 true /* allowStorageAccess */);
1509 0586ed8897f1 limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	358 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	361
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	362
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 template <enum ResourceType resourceType>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	364 static void GetSingleResource(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 {
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	366 if (call.IsDocumentation())
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	367 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	368 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Human);
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	369 OrthancRestApi::DocumentRequestedTags(call);
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	370
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	371 const std::string resource = GetResourceTypeText(resourceType, false /* plural /, false / lower case */);
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	372 call.GetDocumentation()
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	373 .SetTag(GetResourceTypeText(resourceType, true /* plural /, true / upper case */))
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	374 .SetSummary("Get information about some " + resource)
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	375 .SetDescription("Get detailed information about the DICOM " + resource + " whose Orthanc identifier is provided in the URL")
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	376 .SetUriArgument("id", "Orthanc identifier of the " + resource + " of interest")
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	377 .AddAnswerType(MimeType_Json, "Information about the DICOM " + resource)
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	378 .SetHttpGetSample(GetDocumentationSampleResource(resourceType), true);
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	379 return;
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	380 }
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	381
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	382 const DicomToJsonFormat format = OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Human);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	383
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	384 std::set<DicomTag> requestedTags;
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	385 OrthancRestApi::GetRequestedTags(requestedTags, call);
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	386
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	387 Json::Value json;
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	388 if (OrthancRestApi::GetContext(call).ExpandResource(
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	389 json, call.GetUriComponent("id", ""), resourceType, format, requestedTags, true /* allowStorageAccess */))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	391 call.GetOutput().AnswerJson(json);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 template <enum ResourceType resourceType>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	396 static void DeleteSingleResource(RestApiDeleteCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 {
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	398 if (call.IsDocumentation())
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	399 {
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	400 const std::string resource = GetResourceTypeText(resourceType, false /* plural /, false / lower case */);
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	401 call.GetDocumentation()
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	402 .SetTag(GetResourceTypeText(resourceType, true /* plural /, true / upper case */))
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	403 .SetSummary("Delete some " + resource)
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	404 .SetDescription("Delete the DICOM " + resource + " whose Orthanc identifier is provided in the URL")
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	405 .SetUriArgument("id", "Orthanc identifier of the " + resource + " of interest");
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	406 return;
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	407 }
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	408
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	409 Json::Value remainingAncestor;
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	410 if (OrthancRestApi::GetContext(call).DeleteResource(remainingAncestor, call.GetUriComponent("id", ""), resourceType))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 {
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	412 call.GetOutput().AnswerJson(remainingAncestor);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417 // Get information about a single patient -----------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	419 static void IsProtectedPatient(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 {
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	421 if (call.IsDocumentation())
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	422 {
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	423 call.GetDocumentation()
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	424 .SetTag("Patients")
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	425 .SetSummary("Is the patient protected against recycling?")
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	426 .SetUriArgument("id", "Orthanc identifier of the patient of interest")
4403 ad646ff506d0 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4401 diff changeset	427 .AddAnswerType(MimeType_PlainText, "`1` if protected, `0` if not protected");
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	428 return;
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	429 }
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	430
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431 std::string publicId = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 bool isProtected = OrthancRestApi::GetIndex(call).IsProtectedPatient(publicId);
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	433 call.GetOutput().AnswerBuffer(isProtected ? "1" : "0", MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	437 static void SetPatientProtection(RestApiPutCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438 {
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	439 if (call.IsDocumentation())
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	440 {
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	441 call.GetDocumentation()
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	442 .SetTag("Patients")
5467 68e9f7815fb8 Clarified recycle/reject + protection Alain Mazy <am@osimis.io> parents: 5446 diff changeset	443 .SetSummary("Protect/Unprotect a patient against recycling")
68e9f7815fb8 Clarified recycle/reject + protection Alain Mazy <am@osimis.io> parents: 5446 diff changeset	444 .SetDescription("Protects a patient by sending `1` or `true` in the payload request. "
68e9f7815fb8 Clarified recycle/reject + protection Alain Mazy <am@osimis.io> parents: 5446 diff changeset	445 "Unprotects a patient by sending `0` or `false` in the payload requests. "
68e9f7815fb8 Clarified recycle/reject + protection Alain Mazy <am@osimis.io> parents: 5446 diff changeset	446 "More info: https://orthanc.uclouvain.be/book/faq/features.html#recycling-protection")
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	447 .SetUriArgument("id", "Orthanc identifier of the patient of interest");
4399 80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	448 return;
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	449 }
80fd140b12ba New command-line option: "--openapi" to write the OpenAPI documentation of the REST API to a file Sebastien Jodogne <s.jodogne@gmail.com> parents: 4330 diff changeset	450
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 std::string publicId = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454
4473 68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	455 context.GetIndex().SetProtectedPatient(publicId, call.ParseBooleanBody());
68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	456 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	460 // Get information about a single instance ----------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	462 static void GetInstanceFile(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 {
5426 c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	464 static const char* const TRANSCODE = "transcode";
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	465
4405 5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	466 if (call.IsDocumentation())
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	467 {
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	468 call.GetDocumentation()
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	469 .SetTag("Instances")
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	470 .SetSummary("Download DICOM")
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	471 .SetDescription("Download one DICOM instance")
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	472 .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	473 .SetHttpHeader("Accept", "This HTTP header can be set to retrieve the DICOM instance in DICOMweb format")
5426 c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	474 .SetHttpGetArgument(TRANSCODE, RestApiCallDocumentation::Type_String,
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	475 "If present, the DICOM file will be transcoded to the provided "
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	476 "transfer syntax: https://orthanc.uclouvain.be/book/faq/transcoding.html", false)
4405 5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	477 .AddAnswerType(MimeType_Dicom, "The DICOM instance")
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	478 .AddAnswerType(MimeType_DicomWebJson, "The DICOM instance, in DICOMweb JSON format")
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	479 .AddAnswerType(MimeType_DicomWebXml, "The DICOM instance, in DICOMweb XML format");
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	480 return;
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	481 }
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	482
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	485 std::string publicId = call.GetUriComponent("id", "");
3203 810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	486
4330 a01b1c9cbef4 moving generic type definitions from IHttpHandler to HttpToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 4294 diff changeset	487 HttpToolbox::Arguments::const_iterator accept = call.GetHttpHeaders().find("accept");
3203 810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	488 if (accept != call.GetHttpHeaders().end())
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	489 {
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	490 // New in Orthanc 1.5.4
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	491 try
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	492 {
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	493 MimeType mime = StringToMimeType(accept->second.c_str());
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	494
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	495 if (mime == MimeType_DicomWebJson \|\|
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	496 mime == MimeType_DicomWebXml)
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	497 {
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	498 DicomWebJsonVisitor visitor;
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	499
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	500 {
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	501 ServerContext::DicomCacheLocker locker(OrthancRestApi::GetContext(call), publicId);
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	502 locker.GetDicom().Apply(visitor);
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	503 }
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	504
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	505 if (mime == MimeType_DicomWebJson)
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	506 {
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	507 std::string s = visitor.GetResult().toStyledString();
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	508 call.GetOutput().AnswerBuffer(s, MimeType_DicomWebJson);
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	509 }
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	510 else
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	511 {
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	512 std::string xml;
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	513 visitor.FormatXml(xml);
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	514 call.GetOutput().AnswerBuffer(xml, MimeType_DicomWebXml);
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	515 }
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	516
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	517 return;
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	518 }
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	519 }
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	520 catch (OrthancException&)
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	521 {
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	522 }
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	523 }
810772486249 URI "/instances/.../file" can return DICOMweb JSON or XML, depending on Accept header Sebastien Jodogne <s.jodogne@gmail.com> parents: 3187 diff changeset	524
5426 c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	525 if (call.HasArgument(TRANSCODE))
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	526 {
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	527 std::string source;
5427 111e21b4f8bc fix transcoded instance caching Alain Mazy <am@osimis.io> parents: 5426 diff changeset	528 std::string attachmentId;
5426 c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	529 std::string transcoded;
5427 111e21b4f8bc fix transcoded instance caching Alain Mazy <am@osimis.io> parents: 5426 diff changeset	530 context.ReadDicom(source, attachmentId, publicId);
111e21b4f8bc fix transcoded instance caching Alain Mazy <am@osimis.io> parents: 5426 diff changeset	531
111e21b4f8bc fix transcoded instance caching Alain Mazy <am@osimis.io> parents: 5426 diff changeset	532 if (context.TranscodeWithCache(transcoded, source, publicId, attachmentId, GetTransferSyntax(call.GetArgument(TRANSCODE, ""))))
5426 c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	533 {
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	534 call.GetOutput().AnswerBuffer(transcoded, MimeType_Dicom);
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	535 }
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	536 }
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	537 else
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	538 {
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	539 // return the attachment without any transcoding
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	540 context.AnswerAttachment(call.GetOutput(), publicId, FileContentType_Dicom);
c65e036d649b StorageCache is now storing transcoded instances + added ?transcode=... option to the /file route. Alain Mazy <am@osimis.io> parents: 5424 diff changeset	541 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	545 static void ExportInstanceFile(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546 {
4421 a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	547 if (call.IsDocumentation())
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	548 {
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	549 call.GetDocumentation()
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	550 .SetTag("Instances")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	551 .SetSummary("Write DICOM onto filesystem")
5200 f8f1c4a9a216 New configuration option 'RestApiWriteToFileSystemEnabled' Alain Mazy <am@osimis.io> parents: 5185 diff changeset	552 .SetDescription("Write the DICOM file onto the filesystem where Orthanc is running. This is insecure for "
f8f1c4a9a216 New configuration option 'RestApiWriteToFileSystemEnabled' Alain Mazy <am@osimis.io> parents: 5185 diff changeset	553 "Orthanc servers that are remotely accessible since one could overwrite any system file. "
5275 8686476e9d12 fix inclusion of winsock.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 5274 diff changeset	554 "Since Orthanc 1.12.0, this route is disabled by default, but can be enabled using "
8686476e9d12 fix inclusion of winsock.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 5274 diff changeset	555 "the `RestApiWriteToFileSystemEnabled` configuration option.")
4421 a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	556 .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	557 .AddRequestType(MimeType_PlainText, "Target path on the filesystem");
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	558 return;
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	559 }
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	560
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562
5200 f8f1c4a9a216 New configuration option 'RestApiWriteToFileSystemEnabled' Alain Mazy <am@osimis.io> parents: 5185 diff changeset	563 if (!context.IsRestApiWriteToFileSystemEnabled())
f8f1c4a9a216 New configuration option 'RestApiWriteToFileSystemEnabled' Alain Mazy <am@osimis.io> parents: 5185 diff changeset	564 {
f8f1c4a9a216 New configuration option 'RestApiWriteToFileSystemEnabled' Alain Mazy <am@osimis.io> parents: 5185 diff changeset	565 LOG(ERROR) << "The URI /instances/../export is disallowed for security, "
f8f1c4a9a216 New configuration option 'RestApiWriteToFileSystemEnabled' Alain Mazy <am@osimis.io> parents: 5185 diff changeset	566 << "check your configuration option `RestApiWriteToFileSystemEnabled`";
f8f1c4a9a216 New configuration option 'RestApiWriteToFileSystemEnabled' Alain Mazy <am@osimis.io> parents: 5185 diff changeset	567 call.GetOutput().SignalError(HttpStatus_403_Forbidden);
f8f1c4a9a216 New configuration option 'RestApiWriteToFileSystemEnabled' Alain Mazy <am@osimis.io> parents: 5185 diff changeset	568 return;
f8f1c4a9a216 New configuration option 'RestApiWriteToFileSystemEnabled' Alain Mazy <am@osimis.io> parents: 5185 diff changeset	569 }
f8f1c4a9a216 New configuration option 'RestApiWriteToFileSystemEnabled' Alain Mazy <am@osimis.io> parents: 5185 diff changeset	570
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	571 std::string publicId = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	572
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573 std::string dicom;
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	574 context.ReadDicom(dicom, publicId);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	576 std::string target;
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	577 call.BodyToString(target);
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	578 SystemToolbox::WriteFile(dicom, target);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	580 call.GetOutput().AnswerBuffer("{}", MimeType_Json);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	584 template <DicomToJsonFormat format>
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	585 static void GetInstanceTagsInternal(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589 std::string publicId = call.GetUriComponent("id", "");
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	590
e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	591 std::set<DicomTag> ignoreTagLength;
4722 2b4da0ee6b73 added missing documentation of "ignore-length" in "/instances/{id}/tags" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4716 diff changeset	592 ParseSetOfTags(ignoreTagLength, call, IGNORE_LENGTH);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	594 if (format != DicomToJsonFormat_Full \|\|
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	595 !ignoreTagLength.empty())
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596 {
1146 200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	597 Json::Value full;
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	598 context.ReadDicomAsJson(full, publicId, ignoreTagLength);
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	599 AnswerDicomAsJson(call, full, format);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	600 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 else
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602 {
3973 d86bddb50972 fix spelling errors according to debian Sebastien Jodogne <s.jodogne@gmail.com> parents: 3928 diff changeset	603 // This path allows one to avoid the JSON decoding if no
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	604 // simplification is asked, and if no "ignore-length" argument
3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	605 // is present
4513 1f455b86b054 simplification in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	606 Json::Value full;
2127 bfa92c9328d7 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	607 context.ReadDicomAsJson(full, publicId);
4513 1f455b86b054 simplification in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	608 call.GetOutput().AnswerJson(full);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	609 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611
964 cc7a4ae474c1 simplify has a GET argument Sebastien Jodogne <s.jodogne@gmail.com> parents: 963 diff changeset	612
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	613 static void GetInstanceTags(RestApiGetCall& call)
964 cc7a4ae474c1 simplify has a GET argument Sebastien Jodogne <s.jodogne@gmail.com> parents: 963 diff changeset	614 {
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	615 if (call.IsDocumentation())
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	616 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	617 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Full);
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	618 call.GetDocumentation()
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	619 .SetTag("Instances")
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	620 .SetSummary("Get DICOM tags")
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	621 .SetDescription("Get the DICOM tags in the specified format. By default, the `full` format is used, which "
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	622 "combines hexadecimal tags with human-readable description.")
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	623 .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
4722 2b4da0ee6b73 added missing documentation of "ignore-length" in "/instances/{id}/tags" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4716 diff changeset	624 .SetHttpGetArgument(IGNORE_LENGTH, RestApiCallDocumentation::Type_JsonListOfStrings,
2b4da0ee6b73 added missing documentation of "ignore-length" in "/instances/{id}/tags" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4716 diff changeset	625 "Also include the DICOM tags that are provided in this list, even if their associated value is long", false)
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	626 .AddAnswerType(MimeType_Json, "JSON object containing the DICOM tags and their associated value")
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	627 .SetTruncatedJsonHttpGetSample("https://orthanc.uclouvain.be/demo/instances/7c92ce8e-bbf67ed2-ffa3b8c1-a3b35d94-7ff3ae26/tags", 10);
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	628 return;
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	629 }
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	630
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	631 switch (OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Full))
964 cc7a4ae474c1 simplify has a GET argument Sebastien Jodogne <s.jodogne@gmail.com> parents: 963 diff changeset	632 {
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	633 case DicomToJsonFormat_Human:
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	634 GetInstanceTagsInternal<DicomToJsonFormat_Human>(call);
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	635 break;
3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	636
3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	637 case DicomToJsonFormat_Short:
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	638 GetInstanceTagsInternal<DicomToJsonFormat_Short>(call);
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	639 break;
3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	640
3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	641 case DicomToJsonFormat_Full:
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	642 GetInstanceTagsInternal<DicomToJsonFormat_Full>(call);
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	643 break;
3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	644
3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	645 default:
3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	646 throw OrthancException(ErrorCode_InternalError);
964 cc7a4ae474c1 simplify has a GET argument Sebastien Jodogne <s.jodogne@gmail.com> parents: 963 diff changeset	647 }
cc7a4ae474c1 simplify has a GET argument Sebastien Jodogne <s.jodogne@gmail.com> parents: 963 diff changeset	648 }
cc7a4ae474c1 simplify has a GET argument Sebastien Jodogne <s.jodogne@gmail.com> parents: 963 diff changeset	649
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	651 static void GetInstanceSimplifiedTags(RestApiGetCall& call)
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	652 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	653 if (call.IsDocumentation())
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	654 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	655 call.GetDocumentation()
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	656 .SetTag("Instances")
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	657 .SetSummary("Get human-readable tags")
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	658 .SetDescription("Get the DICOM tags in human-readable format (same as the `/instances/{id}/tags?simplify` route)")
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	659 .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
4722 2b4da0ee6b73 added missing documentation of "ignore-length" in "/instances/{id}/tags" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4716 diff changeset	660 .SetHttpGetArgument(IGNORE_LENGTH, RestApiCallDocumentation::Type_JsonListOfStrings,
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	661 "Also include the DICOM tags that are provided in this list, even if their associated value is long", false)
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	662 .AddAnswerType(MimeType_Json, "JSON object containing the DICOM tags and their associated value")
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	663 .SetTruncatedJsonHttpGetSample("https://orthanc.uclouvain.be/demo/instances/7c92ce8e-bbf67ed2-ffa3b8c1-a3b35d94-7ff3ae26/simplified-tags", 10);
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	664 return;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	665 }
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	666 else
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	667 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	668 GetInstanceTagsInternal<DicomToJsonFormat_Human>(call);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	669 }
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	670 }
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	671
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	672
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	673 static void ListFrames(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674 {
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	675 if (call.IsDocumentation())
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	676 {
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	677 call.GetDocumentation()
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	678 .SetTag("Instances")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	679 .SetSummary("List available frames")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	680 .SetDescription("List the frames that are available in the DICOM instance of interest")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	681 .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	682 .AddAnswerType(MimeType_Json, "The list of the indices of the available frames")
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	683 .SetHttpGetSample("https://orthanc.uclouvain.be/demo/instances/7c92ce8e-bbf67ed2-ffa3b8c1-a3b35d94-7ff3ae26/frames", true);
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	684 return;
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	685 }
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	686
1950 533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	687 std::string publicId = call.GetUriComponent("id", "");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688
1950 533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	689 unsigned int numberOfFrames;
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	690
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	691 {
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	692 ServerContext::DicomCacheLocker locker(OrthancRestApi::GetContext(call), publicId);
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	693 numberOfFrames = locker.GetDicom().GetFramesCount();
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	694 }
1950 533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	695
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	696 Json::Value result = Json::arrayValue;
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	697 for (unsigned int i = 0; i < numberOfFrames; i++)
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	698 {
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	699 result.append(i);
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	700 }
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	701
533ff46e944b return a single raw frame from DICOM videos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1929 diff changeset	702 call.GetOutput().AnswerJson(result);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	705
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	706 namespace
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	707 {
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	708 class ImageToEncode
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	709 {
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	710 private:
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	711 std::unique_ptr<ImageAccessor>& image_;
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	712 ImageExtractionMode mode_;
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	713 bool invert_;
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	714 MimeType format_;
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	715 std::string answer_;
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	716
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	717 public:
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	718 ImageToEncode(std::unique_ptr<ImageAccessor>& image,
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	719 ImageExtractionMode mode,
e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	720 bool invert) :
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	721 image_(image),
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	722 mode_(mode),
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	723 invert_(invert),
d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	724 format_(MimeType_Binary)
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	725 {
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	726 }
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	727
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	728 void Answer(RestApiOutput& output)
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	729 {
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	730 output.AnswerBuffer(answer_, format_);
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	731 }
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	732
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	733 void EncodeUsingPng()
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	734 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	735 format_ = MimeType_Png;
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	736 DicomImageDecoder::ExtractPngImage(answer_, image_, mode_, invert_);
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	737 }
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	738
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	739 void EncodeUsingPam()
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	740 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	741 format_ = MimeType_Pam;
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	742 DicomImageDecoder::ExtractPamImage(answer_, image_, mode_, invert_);
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	743 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	744
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	745 void EncodeUsingJpeg(uint8_t quality)
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	746 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	747 format_ = MimeType_Jpeg;
2281 e002430baa41 Fix issue #44 (Bad interpretation of photometric interpretation MONOCHROME1) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	748 DicomImageDecoder::ExtractJpegImage(answer_, image_, mode_, invert_, quality);
1824 b530c3dfe2a6 refactoring image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 1784 diff changeset	749 }
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	750 };
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	751
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	752 class EncodePng : public HttpContentNegociation::IHandler
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	753 {
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	754 private:
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	755 ImageToEncode& image_;
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	756
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	757 public:
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	758 explicit EncodePng(ImageToEncode& image) : image_(image)
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	759 {
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	760 }
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	761
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	762 virtual void Handle(const std::string& type,
5338 78c59b02b121 accept parameters are now provided to HttpContentNegociation::IHandler::Handle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5275 diff changeset	763 const std::string& subtype,
78c59b02b121 accept parameters are now provided to HttpContentNegociation::IHandler::Handle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5275 diff changeset	764 const HttpContentNegociation::Dictionary& parameters) ORTHANC_OVERRIDE
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	765 {
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	766 assert(type == "image");
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	767 assert(subtype == "png");
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	768 image_.EncodeUsingPng();
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	769 }
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	770 };
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	771
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	772 class EncodePam : public HttpContentNegociation::IHandler
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	773 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	774 private:
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	775 ImageToEncode& image_;
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	776
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	777 public:
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	778 explicit EncodePam(ImageToEncode& image) : image_(image)
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	779 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	780 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	781
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	782 virtual void Handle(const std::string& type,
5338 78c59b02b121 accept parameters are now provided to HttpContentNegociation::IHandler::Handle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5275 diff changeset	783 const std::string& subtype,
78c59b02b121 accept parameters are now provided to HttpContentNegociation::IHandler::Handle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5275 diff changeset	784 const HttpContentNegociation::Dictionary& parameters) ORTHANC_OVERRIDE
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	785 {
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	786 assert(type == "image");
2780 d4e81e0a8324 fix am@osimis.io parents: 2726 diff changeset	787 assert(subtype == "x-portable-arbitrarymap");
2699 52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	788 image_.EncodeUsingPam();
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	789 }
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	790 };
52217dc47a4e new image/pam MIME TYPE supported in /instances/../frames/../image-uint8... routes am@osimis.io parents: 2622 diff changeset	791
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	792 class EncodeJpeg : public HttpContentNegociation::IHandler
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	793 {
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	794 private:
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	795 ImageToEncode& image_;
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	796 unsigned int quality_;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	797
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	798 public:
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	799 EncodeJpeg(ImageToEncode& image,
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	800 const RestApiGetCall& call) :
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	801 image_(image)
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	802 {
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	803 std::string v = call.GetArgument("quality", "90" /* default JPEG quality */);
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	804 bool ok = false;
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	805
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	806 try
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	807 {
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	808 quality_ = boost::lexical_cast<unsigned int>(v);
1847 559956d5ceb2 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	809 ok = (quality_ >= 1 && quality_ <= 100);
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	810 }
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	811 catch (boost::bad_lexical_cast&)
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	812 {
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	813 }
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	814
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	815 if (!ok)
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	816 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	817 throw OrthancException(
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	818 ErrorCode_BadRequest,
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	819 "Bad quality for a JPEG encoding (must be a number between 0 and 100): " + v);
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	820 }
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	821 }
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	822
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	823 virtual void Handle(const std::string& type,
5338 78c59b02b121 accept parameters are now provided to HttpContentNegociation::IHandler::Handle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5275 diff changeset	824 const std::string& subtype,
78c59b02b121 accept parameters are now provided to HttpContentNegociation::IHandler::Handle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5275 diff changeset	825 const HttpContentNegociation::Dictionary& parameters) ORTHANC_OVERRIDE
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	826 {
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	827 assert(type == "image");
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	828 assert(subtype == "jpeg");
1902 8b0ee8d5e6d0 Refactoring leading to speedups with custom image decoders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	829 image_.EncodeUsingJpeg(quality_);
1784 2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	830 }
2dbf25006f88 ".../preview" and ".../image-uint8" can return JPEG images if the HTTP Accept Header asks so Sebastien Jodogne <s.jodogne@gmail.com> parents: 1781 diff changeset	831 };
1781 5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	832 }
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	833
5ad4e4d92ecb AcceptMediaDispatcher bootstrap Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	834
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	835 namespace
3600 4066998150ef /instances/{id}/preview route now takes the windowing into account Alain Mazy <alain@mazy.be> parents: 3203 diff changeset	836 {
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	837 class IDecodedFrameHandler : public boost::noncopyable
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	838 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	839 public:
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	840 virtual ~IDecodedFrameHandler()
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	841 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	842 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	843
4769 9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	844 // "dicom" is non-NULL iff. "RequiresDicomTags() == true"
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	845 virtual void Handle(RestApiGetCall& call,
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	846 std::unique_ptr<ImageAccessor>& decoded,
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	847 const ParsedDicomFile* dicom,
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	848 unsigned int frame) = 0;
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	849
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	850 virtual bool RequiresDicomTags() const = 0;
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	851
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	852 static void Apply(RestApiGetCall& call,
4406 4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	853 IDecodedFrameHandler& handler,
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	854 ImageExtractionMode mode /* for generation of documentation */,
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	855 bool isRendered /* for generation of documentation */)
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	856 {
4406 4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	857 if (call.IsDocumentation())
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	858 {
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	859 std::string m;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	860 if (!isRendered)
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	861 {
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	862 switch (mode)
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	863 {
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	864 case ImageExtractionMode_Preview:
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	865 m = "preview";
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	866 break;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	867 case ImageExtractionMode_UInt8:
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	868 m = "uint8";
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	869 break;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	870 case ImageExtractionMode_UInt16:
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	871 m = "uint16";
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	872 break;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	873 case ImageExtractionMode_Int16:
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	874 m = "int16";
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	875 break;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	876 default:
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	877 throw OrthancException(ErrorCode_ParameterOutOfRange);
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	878 }
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	879 }
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	880
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	881 std::string description;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	882 std::string verb = (isRendered ? "Render" : "Decode");
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	883
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	884 if (call.HasUriComponent("frame"))
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	885 {
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	886 description = verb + " one frame of interest from the given DICOM instance.";
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	887 call.GetDocumentation()
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	888 .SetSummary(verb + " a frame" + (m.empty() ? "" : " (" + m + ")"))
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	889 .SetUriArgument("frame", RestApiCallDocumentation::Type_Number, "Index of the frame (starts at `0`)");
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	890 }
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	891 else
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	892 {
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	893 description = verb + " the first frame of the given DICOM instance.";
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	894 call.GetDocumentation()
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	895 .SetSummary(verb + " an image" + (m.empty() ? "" : " (" + m + ")"));
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	896 }
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	897
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	898 if (isRendered)
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	899 {
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	900 description += (" This function takes scaling into account (`RescaleSlope` and `RescaleIntercept` tags), "
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	901 "as well as the default windowing stored in the DICOM file (`WindowCenter` and `WindowWidth`tags), "
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	902 "and can be used to resize the resulting image. Color images are not affected by windowing.");
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	903 call.GetDocumentation()
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	904 .SetHttpGetArgument("window-center",RestApiCallDocumentation::Type_Number, "Windowing center", false)
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	905 .SetHttpGetArgument("window-width",RestApiCallDocumentation::Type_Number, "Windowing width", false)
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	906 .SetHttpGetArgument("width",RestApiCallDocumentation::Type_Number, "Width of the resized image", false)
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	907 .SetHttpGetArgument("height",RestApiCallDocumentation::Type_Number, "Height of the resized image", false)
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	908 .SetHttpGetArgument("smooth",RestApiCallDocumentation::Type_Boolean, "Whether to smooth image on resize", false);
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	909 }
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	910 else
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	911 {
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	912 switch (mode)
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	913 {
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	914 case ImageExtractionMode_Preview:
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	915 description += " The full dynamic range of grayscale images is rescaled to the [0,255] range.";
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	916 break;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	917 case ImageExtractionMode_UInt8:
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	918 description += " Pixels of grayscale images are truncated to the [0,255] range.";
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	919 break;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	920 case ImageExtractionMode_UInt16:
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	921 description += " Pixels of grayscale images are truncated to the [0,65535] range.";
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	922 break;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	923 case ImageExtractionMode_Int16:
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	924 description += (" Pixels of grayscale images are truncated to the [-32768,32767] range. "
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	925 "Negative values must be interpreted according to two's complement.");
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	926 break;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	927 default:
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	928 throw OrthancException(ErrorCode_ParameterOutOfRange);
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	929 }
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	930 }
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	931
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	932 call.GetDocumentation()
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	933 .SetTag("Instances")
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	934 .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	935 .SetHttpGetArgument("quality", RestApiCallDocumentation::Type_Number, "Quality for JPEG images (between 1 and 100, defaults to 90)", false)
4804 ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	936 .SetHttpGetArgument("returnUnsupportedImage", RestApiCallDocumentation::Type_Boolean, "Returns an unsupported.png placeholder image if unable to provide the image instead of returning a 415 HTTP error (defaults to false)", false)
4406 4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	937 .SetHttpHeader("Accept", "Format of the resulting image. Can be `image/png` (default), `image/jpeg` or `image/x-portable-arbitrarymap`")
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	938 .AddAnswerType(MimeType_Png, "PNG image")
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	939 .AddAnswerType(MimeType_Jpeg, "JPEG image")
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	940 .AddAnswerType(MimeType_Pam, "PAM image (Portable Arbitrary Map)")
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	941 .SetDescription(description);
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	942
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	943 return;
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	944 }
4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	945
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	946 ServerContext& context = OrthancRestApi::GetContext(call);
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	947
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	948 std::string frameId = call.GetUriComponent("frame", "0");
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	949
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	950 unsigned int frame;
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	951 try
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	952 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	953 frame = boost::lexical_cast<unsigned int>(frameId);
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	954 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	955 catch (boost::bad_lexical_cast&)
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	956 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	957 return;
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	958 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	959
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	960 std::unique_ptr<ImageAccessor> decoded;
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	961
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	962 try
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	963 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	964 std::string publicId = call.GetUriComponent("id", "");
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	965
3928 4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	966 decoded.reset(context.DecodeDicomFrame(publicId, frame));
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	967
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	968 if (decoded.get() == NULL)
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	969 {
3928 4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	970 throw OrthancException(ErrorCode_NotImplemented,
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	971 "Cannot decode DICOM instance with ID: " + publicId);
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	972 }
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	973
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	974 if (handler.RequiresDicomTags())
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	975 {
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	976 /**
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	977 * Retrieve a summary of the DICOM tags, which is
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	978 * necessary to deal with MONOCHROME1 photometric
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	979 * interpretation, and with windowing parameters.
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	980 **/
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	981 ServerContext::DicomCacheLocker locker(context, publicId);
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	982 handler.Handle(call, decoded, &locker.GetDicom(), frame);
4769 9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	983 }
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	984 else
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	985 {
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	986 handler.Handle(call, decoded, NULL, frame);
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	987 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	988 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	989 catch (OrthancException& e)
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	990 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	991 if (e.GetErrorCode() == ErrorCode_ParameterOutOfRange \|\|
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	992 e.GetErrorCode() == ErrorCode_UnknownResource)
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	993 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	994 // The frame number is out of the range for this DICOM
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	995 // instance, the resource is not existent
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	996 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	997 else
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	998 {
4804 ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	999 if (call.HasArgument("returnUnsupportedImage"))
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1000 {
4804 ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1001 std::string root = "";
ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1002 for (size_t i = 1; i < call.GetFullUri().size(); i++)
ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1003 {
ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1004 root += "../";
ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1005 }
ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1006
ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1007 call.GetOutput().Redirect(root + "app/images/unsupported.png");
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1008 }
4804 ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1009 else
ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1010 {
ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1011 call.GetOutput().SignalError(HttpStatus_415_UnsupportedMediaType);
ae643f664628 new option returnUnsupportedImage for /preview & /rendered routes Alain Mazy <am@osimis.io> parents: 4777 diff changeset	1012 }
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1013 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1014 return;
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1015 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1016
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1017 }
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1018
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1019
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1020 static void DefaultHandler(RestApiGetCall& call,
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	1021 std::unique_ptr<ImageAccessor>& decoded,
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1022 ImageExtractionMode mode,
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1023 bool invert)
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1024 {
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1025 ImageToEncode image(decoded, mode, invert);
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1026
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1027 HttpContentNegociation negociation;
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1028 EncodePng png(image);
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1029 negociation.Register(MIME_PNG, png);
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1030
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1031 EncodeJpeg jpeg(image, call);
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1032 negociation.Register(MIME_JPEG, jpeg);
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1033
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1034 EncodePam pam(image);
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1035 negociation.Register(MIME_PAM, pam);
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1036
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1037 if (negociation.Apply(call.GetHttpHeaders()))
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1038 {
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1039 image.Answer(call.GetOutput());
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1040 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1041 }
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1042 };
3600 4066998150ef /instances/{id}/preview route now takes the windowing into account Alain Mazy <alain@mazy.be> parents: 3203 diff changeset	1043
4066998150ef /instances/{id}/preview route now takes the windowing into account Alain Mazy <alain@mazy.be> parents: 3203 diff changeset	1044
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1045 class GetImageHandler : public IDecodedFrameHandler
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1046 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1047 private:
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1048 ImageExtractionMode mode_;
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1049
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1050 public:
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	1051 explicit GetImageHandler(ImageExtractionMode mode) :
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1052 mode_(mode)
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1053 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1054 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1055
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1056 virtual void Handle(RestApiGetCall& call,
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	1057 std::unique_ptr<ImageAccessor>& decoded,
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1058 const ParsedDicomFile* dicom,
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1059 unsigned int frame) ORTHANC_OVERRIDE
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1060 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1061 bool invert = false;
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1062
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1063 if (mode_ == ImageExtractionMode_Preview)
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1064 {
4769 9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1065 if (dicom == NULL)
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1066 {
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1067 throw OrthancException(ErrorCode_InternalError);
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1068 }
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1069
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1070 DicomMap tags;
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1071 OrthancConfiguration::DefaultExtractDicomSummary(tags, *dicom);
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1072
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1073 DicomImageInformation info(tags);
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1074 invert = (info.GetPhotometricInterpretation() == PhotometricInterpretation_Monochrome1);
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1075 }
3600 4066998150ef /instances/{id}/preview route now takes the windowing into account Alain Mazy <alain@mazy.be> parents: 3203 diff changeset	1076
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1077 DefaultHandler(call, decoded, mode_, invert);
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1078 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1079
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1080 virtual bool RequiresDicomTags() const ORTHANC_OVERRIDE
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1081 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1082 return mode_ == ImageExtractionMode_Preview;
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1083 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1084 };
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1085
3600 4066998150ef /instances/{id}/preview route now takes the windowing into account Alain Mazy <alain@mazy.be> parents: 3203 diff changeset	1086
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1087 class RenderedFrameHandler : public IDecodedFrameHandler
3600 4066998150ef /instances/{id}/preview route now takes the windowing into account Alain Mazy <alain@mazy.be> parents: 3203 diff changeset	1088 {
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1089 private:
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1090 static void GetUserArguments(double& windowWidth /* inout */,
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1091 double& windowCenter /* inout */,
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1092 unsigned int& argWidth,
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1093 unsigned int& argHeight,
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1094 bool& smooth,
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	1095 const RestApiGetCall& call)
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1096 {
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1097 static const char* ARG_WINDOW_CENTER = "window-center";
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1098 static const char* ARG_WINDOW_WIDTH = "window-width";
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1099 static const char* ARG_WIDTH = "width";
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1100 static const char* ARG_HEIGHT = "height";
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1101 static const char* ARG_SMOOTH = "smooth";
3600 4066998150ef /instances/{id}/preview route now takes the windowing into account Alain Mazy <alain@mazy.be> parents: 3203 diff changeset	1102
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1103 if (call.HasArgument(ARG_WINDOW_WIDTH) &&
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1104 !SerializationToolbox::ParseDouble(windowWidth, call.GetArgument(ARG_WINDOW_WIDTH, "")))
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1105 {
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1106 throw OrthancException(ErrorCode_ParameterOutOfRange,
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1107 "Bad value for argument: " + std::string(ARG_WINDOW_WIDTH));
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1108 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1109
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1110 if (call.HasArgument(ARG_WINDOW_CENTER) &&
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1111 !SerializationToolbox::ParseDouble(windowCenter, call.GetArgument(ARG_WINDOW_CENTER, "")))
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1112 {
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1113 throw OrthancException(ErrorCode_ParameterOutOfRange,
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1114 "Bad value for argument: " + std::string(ARG_WINDOW_CENTER));
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1115 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1116
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1117 argWidth = 0;
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1118 argHeight = 0;
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1119
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1120 if (call.HasArgument(ARG_WIDTH))
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1121 {
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1122 try
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1123 {
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1124 int tmp = boost::lexical_cast<int>(call.GetArgument(ARG_WIDTH, ""));
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1125 if (tmp < 0)
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1126 {
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1127 throw OrthancException(ErrorCode_ParameterOutOfRange,
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1128 "Argument cannot be negative: " + std::string(ARG_WIDTH));
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1129 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1130 else
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1131 {
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1132 argWidth = static_cast<unsigned int>(tmp);
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1133 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1134 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1135 catch (boost::bad_lexical_cast&)
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1136 {
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1137 throw OrthancException(ErrorCode_ParameterOutOfRange,
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1138 "Bad value for argument: " + std::string(ARG_WIDTH));
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1139 }
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1140 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1141
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1142 if (call.HasArgument(ARG_HEIGHT))
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1143 {
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1144 try
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1145 {
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1146 int tmp = boost::lexical_cast<int>(call.GetArgument(ARG_HEIGHT, ""));
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1147 if (tmp < 0)
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1148 {
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1149 throw OrthancException(ErrorCode_ParameterOutOfRange,
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1150 "Argument cannot be negative: " + std::string(ARG_HEIGHT));
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1151 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1152 else
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1153 {
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1154 argHeight = static_cast<unsigned int>(tmp);
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1155 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1156 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1157 catch (boost::bad_lexical_cast&)
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1158 {
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1159 throw OrthancException(ErrorCode_ParameterOutOfRange,
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1160 "Bad value for argument: " + std::string(ARG_HEIGHT));
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1161 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1162 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1163
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1164 smooth = false;
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1165
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1166 if (call.HasArgument(ARG_SMOOTH))
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1167 {
4473 68f52897c119 new URIs: /tools/accepted-transfer-syntaxes and /tools/unknown-sop-class-accepted to replace Lua callbacks for transfer syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	1168 smooth = RestApiCall::ParseBoolean(call.GetArgument(ARG_SMOOTH, ""));
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1169 }
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1170 }
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1171
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1172
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1173 public:
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1174 virtual void Handle(RestApiGetCall& call,
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	1175 std::unique_ptr<ImageAccessor>& decoded,
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1176 const ParsedDicomFile* dicom,
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1177 unsigned int frame) ORTHANC_OVERRIDE
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1178 {
4769 9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1179 if (dicom == NULL)
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1180 {
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1181 throw OrthancException(ErrorCode_InternalError);
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1182 }
9da6ca57a977 IDecodedFrameHandler can access full ParsedDicomFile instead of the DicomMap summary Sebastien Jodogne <s.jodogne@gmail.com> parents: 4722 diff changeset	1183
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1184 PhotometricInterpretation photometric;
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1185 const bool invert = (dicom->LookupPhotometricInterpretation(photometric) &&
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1186 photometric == PhotometricInterpretation_Monochrome1);
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1187
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1188 double rescaleIntercept, rescaleSlope, windowCenter, windowWidth;
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1189 dicom->GetRescale(rescaleIntercept, rescaleSlope, frame);
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1190 dicom->GetDefaultWindowing(windowCenter, windowWidth, frame);
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1191
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1192 unsigned int argWidth, argHeight;
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1193 bool smooth;
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1194 GetUserArguments(windowWidth, windowCenter, argWidth, argHeight, smooth, call);
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1195
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1196 unsigned int targetWidth = decoded->GetWidth();
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1197 unsigned int targetHeight = decoded->GetHeight();
3686 a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1198
a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1199 if (decoded->GetWidth() != 0 &&
a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1200 decoded->GetHeight() != 0)
a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1201 {
a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1202 float ratio = 1;
a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1203
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1204 if (argWidth != 0 &&
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1205 argHeight != 0)
3686 a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1206 {
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1207 float ratioX = static_cast<float>(argWidth) / static_cast<float>(decoded->GetWidth());
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1208 float ratioY = static_cast<float>(argHeight) / static_cast<float>(decoded->GetHeight());
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1209 ratio = std::min(ratioX, ratioY);
3686 a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1210 }
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1211 else if (argWidth != 0)
3686 a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1212 {
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1213 ratio = static_cast<float>(argWidth) / static_cast<float>(decoded->GetWidth());
3686 a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1214 }
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1215 else if (argHeight != 0)
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1216 {
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1217 ratio = static_cast<float>(argHeight) / static_cast<float>(decoded->GetHeight());
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1218 }
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1219
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1220 targetWidth = boost::math::iround(ratio * static_cast<float>(decoded->GetWidth()));
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1221 targetHeight = boost::math::iround(ratio * static_cast<float>(decoded->GetHeight()));
3686 a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1222 }
a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1223
5054 255b02c68908 Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 5048 diff changeset	1224 if (decoded->GetFormat() == PixelFormat_RGB24 \|\| decoded->GetFormat() == PixelFormat_RGB48)
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1225 {
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1226 if (targetWidth == decoded->GetWidth() &&
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1227 targetHeight == decoded->GetHeight())
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1228 {
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1229 DefaultHandler(call, decoded, ImageExtractionMode_Preview, false);
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1230 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1231 else
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1232 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	1233 std::unique_ptr<ImageAccessor> resized(
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1234 new Image(decoded->GetFormat(), targetWidth, targetHeight, false));
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1235
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1236 if (smooth &&
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1237 (targetWidth < decoded->GetWidth() \|\|
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1238 targetHeight < decoded->GetHeight()))
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1239 {
4065 d6362b2c4b61 export dcmdata in shared library, rounding in convolution tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	1240 ImageProcessing::SmoothGaussian5x5(decoded, false / be fast, don't round */);
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1241 }
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1242
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1243 ImageProcessing::Resize(resized, decoded);
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1244 DefaultHandler(call, resized, ImageExtractionMode_Preview, false);
3685 2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1245 }
2cc34837d694 rendering of RGB24 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3683 diff changeset	1246 }
3686 a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1247 else
a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1248 {
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1249 // Grayscale image: (1) convert to Float32, (2) apply
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1250 // windowing to get a Grayscale8, (3) possibly resize
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1251
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1252 Image converted(PixelFormat_Float32, decoded->GetWidth(), decoded->GetHeight(), false);
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1253 ImageProcessing::Convert(converted, *decoded);
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1254
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1255 // Avoid divisions by zero
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1256 if (windowWidth <= 1.0f)
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1257 {
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1258 windowWidth = 1;
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1259 }
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1260
4834 bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1261 if (std::abs(rescaleSlope) <= 0.0001)
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1262 {
4834 bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1263 rescaleSlope = 0.0001;
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1264 }
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1265
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1266 const double scaling = 255.0 * rescaleSlope / windowWidth;
3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1267 const double offset = (rescaleIntercept - windowCenter + windowWidth / 2.0) / rescaleSlope;
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1268
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	1269 std::unique_ptr<ImageAccessor> rescaled(new Image(PixelFormat_Grayscale8, decoded->GetWidth(), decoded->GetHeight(), false));
4777 3b78ba359db3 Support detection of windowing and rescale in Philips multiframe images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4769 diff changeset	1270 ImageProcessing::ShiftScale(*rescaled, converted, static_cast<float>(offset), static_cast<float>(scaling), false);
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1271
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1272 if (targetWidth == decoded->GetWidth() &&
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1273 targetHeight == decoded->GetHeight())
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1274 {
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1275 DefaultHandler(call, rescaled, ImageExtractionMode_UInt8, invert);
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1276 }
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1277 else
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1278 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3690 diff changeset	1279 std::unique_ptr<ImageAccessor> resized(
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1280 new Image(PixelFormat_Grayscale8, targetWidth, targetHeight, false));
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1281
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1282 if (smooth &&
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1283 (targetWidth < decoded->GetWidth() \|\|
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1284 targetHeight < decoded->GetHeight()))
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1285 {
4065 d6362b2c4b61 export dcmdata in shared library, rounding in convolution tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	1286 ImageProcessing::SmoothGaussian5x5(rescaled, false / be fast, don't round */);
3690 a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1287 }
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1288
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1289 ImageProcessing::Resize(resized, rescaled);
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1290 DefaultHandler(call, resized, ImageExtractionMode_UInt8, invert);
a9ce35d67c3c implementation of "/instances/.../rendered" for grayscale images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3687 diff changeset	1291 }
3686 a79aecf1f9ae cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3685 diff changeset	1292 }
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1293 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1294
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1295 virtual bool RequiresDicomTags() const ORTHANC_OVERRIDE
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1296 {
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1297 return true;
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1298 }
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1299 };
3600 4066998150ef /instances/{id}/preview route now takes the windowing into account Alain Mazy <alain@mazy.be> parents: 3203 diff changeset	1300 }
4066998150ef /instances/{id}/preview route now takes the windowing into account Alain Mazy <alain@mazy.be> parents: 3203 diff changeset	1301
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1302
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1303 template <enum ImageExtractionMode mode>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	1304 static void GetImage(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1305 {
3926 2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	1306 Semaphore::Locker locker(throttlingSemaphore_);
2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	1307
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1308 GetImageHandler handler(mode);
4406 4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	1309 IDecodedFrameHandler::Apply(call, handler, mode, false /* not rendered */);
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1310 }
1906 d7c1cb559431 optimization for multi-frame images Sebastien Jodogne <s.jodogne@gmail.com> parents: 1902 diff changeset	1311
1826 ac5b0b4e2434 refactoring of DicomImageDecoder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1824 diff changeset	1312
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1313 static void GetRenderedFrame(RestApiGetCall& call)
12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1314 {
3926 2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	1315 Semaphore::Locker locker(throttlingSemaphore_);
2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	1316
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1317 RenderedFrameHandler handler;
4406 4cb9f66a1c7c documenting generation of images Sebastien Jodogne <s.jodogne@gmail.com> parents: 4405 diff changeset	1318 IDecodedFrameHandler::Apply(call, handler, ImageExtractionMode_Preview /* arbitrary value */, true);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1319 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1320
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1321
4834 bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1322 static void DocumentSharedNumpy(RestApiGetCall& call)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1323 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1324 call.GetDocumentation()
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1325 .SetUriArgument("id", "Orthanc identifier of the DICOM resource of interest")
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1326 .SetHttpGetArgument("compress", RestApiCallDocumentation::Type_Boolean, "Compress the file as `.npz`", false)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1327 .SetHttpGetArgument("rescale", RestApiCallDocumentation::Type_Boolean,
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1328 "On grayscale images, apply the rescaling and return floating-point values", false)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1329 .AddAnswerType(MimeType_PlainText, "Numpy file: https://numpy.org/devdocs/reference/generated/numpy.lib.format.html");
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1330 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1331
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1332
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1333 namespace
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1334 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1335 class NumpyVisitor : public boost::noncopyable
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1336 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1337 private:
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1338 bool rescale_;
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1339 unsigned int depth_;
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1340 unsigned int currentDepth_;
4858 8b51d65584f0 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4853 diff changeset	1341 unsigned int width_;
4834 bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1342 unsigned int height_;
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1343 PixelFormat format_;
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1344 ChunkedBuffer buffer_;
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1345
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1346 public:
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1347 NumpyVisitor(unsigned int depth /* can be zero if 2D frame */,
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1348 bool rescale) :
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1349 rescale_(rescale),
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1350 depth_(depth),
4858 8b51d65584f0 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4853 diff changeset	1351 currentDepth_(0),
8b51d65584f0 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4853 diff changeset	1352 width_(0), // dummy initialization
8b51d65584f0 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4853 diff changeset	1353 height_(0), // dummy initialization
8b51d65584f0 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4853 diff changeset	1354 format_(PixelFormat_Grayscale8) // dummy initialization
4834 bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1355 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1356 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1357
4858 8b51d65584f0 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4853 diff changeset	1358 void WriteFrame(const ParsedDicomFile& dicom,
4834 bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1359 unsigned int frame)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1360 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1361 std::unique_ptr<ImageAccessor> decoded(dicom.DecodeFrame(frame));
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1362
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1363 if (decoded.get() == NULL)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1364 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1365 throw OrthancException(ErrorCode_NotImplemented, "Cannot decode DICOM instance");
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1366 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1367
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1368 if (currentDepth_ == 0)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1369 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1370 width_ = decoded->GetWidth();
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1371 height_ = decoded->GetHeight();
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1372 format_ = decoded->GetFormat();
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1373 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1374 else if (width_ != decoded->GetWidth() \|\|
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1375 height_ != decoded->GetHeight())
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1376 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1377 throw OrthancException(ErrorCode_IncompatibleImageSize, "The size of the frames varies across the instance(s)");
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1378 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1379 else if (format_ != decoded->GetFormat())
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1380 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1381 throw OrthancException(ErrorCode_IncompatibleImageFormat, "The pixel format of the frames varies across the instance(s)");
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1382 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1383
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1384 if (rescale_ &&
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1385 decoded->GetFormat() != PixelFormat_RGB24)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1386 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1387 if (currentDepth_ == 0)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1388 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1389 NumpyWriter::WriteHeader(buffer_, depth_, width_, height_, PixelFormat_Float32);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1390 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1391
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1392 double rescaleIntercept, rescaleSlope;
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1393 dicom.GetRescale(rescaleIntercept, rescaleSlope, frame);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1394
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1395 Image converted(PixelFormat_Float32, decoded->GetWidth(), decoded->GetHeight(), false);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1396 ImageProcessing::Convert(converted, *decoded);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1397 ImageProcessing::ShiftScale2(converted, static_cast<float>(rescaleIntercept), static_cast<float>(rescaleSlope), false);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1398
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1399 NumpyWriter::WritePixels(buffer_, converted);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1400 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1401 else
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1402 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1403 if (currentDepth_ == 0)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1404 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1405 NumpyWriter::WriteHeader(buffer_, depth_, width_, height_, format_);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1406 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1407
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1408 NumpyWriter::WritePixels(buffer_, *decoded);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1409 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1410
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1411 currentDepth_ ++;
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1412 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1413
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1414 void Answer(RestApiOutput& output,
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1415 bool compress)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1416 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1417 if ((depth_ == 0 && currentDepth_ != 1) \|\|
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1418 (depth_ != 0 && currentDepth_ != depth_))
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1419 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1420 throw OrthancException(ErrorCode_BadSequenceOfCalls);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1421 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1422 else
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1423 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1424 std::string answer;
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1425 NumpyWriter::Finalize(answer, buffer_, compress);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1426 output.AnswerBuffer(answer, MimeType_Binary);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1427 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1428 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1429 };
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1430 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1431
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1432
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1433 static void GetNumpyFrame(RestApiGetCall& call)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1434 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1435 if (call.IsDocumentation())
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1436 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1437 DocumentSharedNumpy(call);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1438 call.GetDocumentation()
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1439 .SetTag("Instances")
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1440 .SetSummary("Decode frame for numpy")
4836 ec1e9571b645 document number of dimensions in numpy arrays Sebastien Jodogne <s.jodogne@gmail.com> parents: 4834 diff changeset	1441 .SetDescription("Decode one frame of interest from the given DICOM instance, for use with numpy in Python. "
ec1e9571b645 document number of dimensions in numpy arrays Sebastien Jodogne <s.jodogne@gmail.com> parents: 4834 diff changeset	1442 "The numpy array has 3 dimensions: (height, width, color channel).")
4834 bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1443 .SetUriArgument("frame", RestApiCallDocumentation::Type_Number, "Index of the frame (starts at `0`)");
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1444 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1445 else
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1446 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1447 const std::string instanceId = call.GetUriComponent("id", "");
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1448 const bool compress = call.GetBooleanArgument("compress", false);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1449 const bool rescale = call.GetBooleanArgument("rescale", true);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1450
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1451 uint32_t frame;
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1452 if (!SerializationToolbox::ParseUnsignedInteger32(frame, call.GetUriComponent("frame", "0")))
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1453 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1454 throw OrthancException(ErrorCode_ParameterOutOfRange, "Expected an unsigned integer for the \"frame\" argument");
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1455 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1456
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1457 NumpyVisitor visitor(0 /* no depth, 2D frame */, rescale);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1458
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1459 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1460 Semaphore::Locker throttling(throttlingSemaphore_);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1461 ServerContext::DicomCacheLocker locker(OrthancRestApi::GetContext(call), instanceId);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1462
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1463 visitor.WriteFrame(locker.GetDicom(), frame);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1464 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1465
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1466 visitor.Answer(call.GetOutput(), compress);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1467 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1468 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1469
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1470
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1471 static void GetNumpyInstance(RestApiGetCall& call)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1472 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1473 if (call.IsDocumentation())
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1474 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1475 DocumentSharedNumpy(call);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1476 call.GetDocumentation()
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1477 .SetTag("Instances")
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1478 .SetSummary("Decode instance for numpy")
4836 ec1e9571b645 document number of dimensions in numpy arrays Sebastien Jodogne <s.jodogne@gmail.com> parents: 4834 diff changeset	1479 .SetDescription("Decode the given DICOM instance, for use with numpy in Python. "
ec1e9571b645 document number of dimensions in numpy arrays Sebastien Jodogne <s.jodogne@gmail.com> parents: 4834 diff changeset	1480 "The numpy array has 4 dimensions: (frame, height, width, color channel).");
4834 bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1481 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1482 else
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1483 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1484 const std::string instanceId = call.GetUriComponent("id", "");
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1485 const bool compress = call.GetBooleanArgument("compress", false);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1486 const bool rescale = call.GetBooleanArgument("rescale", true);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1487
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1488 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1489 Semaphore::Locker throttling(throttlingSemaphore_);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1490 ServerContext::DicomCacheLocker locker(OrthancRestApi::GetContext(call), instanceId);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1491
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1492 const unsigned int depth = locker.GetDicom().GetFramesCount();
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1493 if (depth == 0)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1494 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1495 throw OrthancException(ErrorCode_BadFileFormat, "Empty DICOM instance");
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1496 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1497
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1498 NumpyVisitor visitor(depth, rescale);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1499
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1500 for (unsigned int frame = 0; frame < depth; frame++)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1501 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1502 visitor.WriteFrame(locker.GetDicom(), frame);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1503 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1504
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1505 visitor.Answer(call.GetOutput(), compress);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1506 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1507 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1508 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1509
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1510
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1511 static void GetNumpySeries(RestApiGetCall& call)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1512 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1513 if (call.IsDocumentation())
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1514 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1515 DocumentSharedNumpy(call);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1516 call.GetDocumentation()
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1517 .SetTag("Series")
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1518 .SetSummary("Decode series for numpy")
4836 ec1e9571b645 document number of dimensions in numpy arrays Sebastien Jodogne <s.jodogne@gmail.com> parents: 4834 diff changeset	1519 .SetDescription("Decode the given DICOM series, for use with numpy in Python. "
ec1e9571b645 document number of dimensions in numpy arrays Sebastien Jodogne <s.jodogne@gmail.com> parents: 4834 diff changeset	1520 "The numpy array has 4 dimensions: (frame, height, width, color channel).");
4834 bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1521 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1522 else
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1523 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1524 const std::string seriesId = call.GetUriComponent("id", "");
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1525 const bool compress = call.GetBooleanArgument("compress", false);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1526 const bool rescale = call.GetBooleanArgument("rescale", true);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1527
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1528 Semaphore::Locker throttling(throttlingSemaphore_);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1529
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1530 ServerIndex& index = OrthancRestApi::GetIndex(call);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1531 SliceOrdering ordering(index, seriesId);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1532
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1533 unsigned int depth = 0;
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1534 for (size_t i = 0; i < ordering.GetInstancesCount(); i++)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1535 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1536 depth += ordering.GetFramesCount(i);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1537 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1538
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1539 ServerContext& context = OrthancRestApi::GetContext(call);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1540
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1541 NumpyVisitor visitor(depth, rescale);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1542
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1543 for (size_t i = 0; i < ordering.GetInstancesCount(); i++)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1544 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1545 const std::string& instanceId = ordering.GetInstanceId(i);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1546 unsigned int framesCount = ordering.GetFramesCount(i);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1547
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1548 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1549 ServerContext::DicomCacheLocker locker(context, instanceId);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1550
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1551 for (unsigned int frame = 0; frame < framesCount; frame++)
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1552 {
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1553 visitor.WriteFrame(locker.GetDicom(), frame);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1554 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1555 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1556 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1557
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1558 visitor.Answer(call.GetOutput(), compress);
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1559 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1560 }
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1561
bec432ee1094 download of numpy arrays from the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	1562
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	1563 static void GetMatlabImage(RestApiGetCall& call)
874 87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1564 {
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1565 if (call.IsDocumentation())
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1566 {
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1567 std::string description;
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1568
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1569 if (call.HasUriComponent("frame"))
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1570 {
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1571 description = "Decode one frame of interest from the given DICOM instance";
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1572 call.GetDocumentation()
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1573 .SetUriArgument("frame", RestApiCallDocumentation::Type_Number, "Index of the frame (starts at `0`)");
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1574 }
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1575 else
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1576 {
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1577 description = "Decode the first frame of the given DICOM instance.";
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1578 }
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1579
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1580 call.GetDocumentation()
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1581 .SetTag("Instances")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1582 .SetSummary("Decode frame for Matlab")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1583 .SetDescription(description + ", and export this frame as a Octave/Matlab matrix to be imported with `eval()`: "
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	1584 "https://orthanc.uclouvain.be/book/faq/matlab.html")
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1585 .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1586 .AddAnswerType(MimeType_PlainText, "Octave/Matlab matrix");
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1587 return;
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1588 }
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1589
3926 2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	1590 Semaphore::Locker locker(throttlingSemaphore_);
2910b0d30fe0 Allow concurrent calls to the custom image decoders provided by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 3816 diff changeset	1591
874 87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1592 ServerContext& context = OrthancRestApi::GetContext(call);
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1593
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1594 std::string frameId = call.GetUriComponent("frame", "0");
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1595
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1596 unsigned int frame;
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1597 try
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1598 {
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1599 frame = boost::lexical_cast<unsigned int>(frameId);
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1600 }
2836 7133ad478eea fix Debian warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1601 catch (boost::bad_lexical_cast&)
874 87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1602 {
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1603 return;
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1604 }
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1605
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1606 std::string publicId = call.GetUriComponent("id", "");
3928 4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1607 std::unique_ptr<ImageAccessor> decoded(context.DecodeDicomFrame(publicId, frame));
874 87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1608
3928 4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1609 if (decoded.get() == NULL)
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1610 {
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1611 throw OrthancException(ErrorCode_NotImplemented,
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1612 "Cannot decode DICOM instance with ID: " + publicId);
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1613 }
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1614 else
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1615 {
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1616 std::string result;
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1617 decoded->ToMatlabString(result);
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1618 call.GetOutput().AnswerBuffer(result, MimeType_PlainText);
4cdc875510d1 ServerContext::DecodeDicomFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3926 diff changeset	1619 }
874 87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1620 }
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1621
87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	1622
2408 26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1623 template <bool GzipCompression>
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1624 static void GetRawFrame(RestApiGetCall& call)
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1625 {
4408 d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1626 if (call.IsDocumentation())
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1627 {
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1628 call.GetDocumentation()
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1629 .SetTag("Instances")
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1630 .SetSummary("Access raw frame" + std::string(GzipCompression ? " (compressed)" : ""))
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1631 .SetDescription("Access the raw content of one individual frame of the DICOM instance of interest, "
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1632 "bypassing image decoding. This is notably useful to access the source files "
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1633 "in compressed transfer syntaxes." +
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1634 std::string(GzipCompression ? " The image is compressed using gzip" : ""))
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	1635 .SetUriArgument("id", "Orthanc identifier of the instance of interest")
4408 d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1636 .SetUriArgument("frame", RestApiCallDocumentation::Type_Number, "Index of the frame (starts at `0`)");
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1637
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1638 if (GzipCompression)
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1639 {
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1640 call.GetDocumentation().AddAnswerType(MimeType_Gzip, "The raw frame, compressed using gzip");
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1641 }
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1642 else
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1643 {
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1644 call.GetDocumentation().AddAnswerType(MimeType_Binary, "The raw frame");
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1645 }
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1646 return;
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1647 }
d2bfadc2948b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4407 diff changeset	1648
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1649 std::string frameId = call.GetUriComponent("frame", "0");
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1650
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1651 unsigned int frame;
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1652 try
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1653 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1654 frame = boost::lexical_cast<unsigned int>(frameId);
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1655 }
2836 7133ad478eea fix Debian warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2804 diff changeset	1656 catch (boost::bad_lexical_cast&)
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1657 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1658 return;
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1659 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1660
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1661 std::string publicId = call.GetUriComponent("id", "");
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1662 std::string raw;
9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1663 MimeType mime;
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1664
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1665 {
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1666 ServerContext::DicomCacheLocker locker(OrthancRestApi::GetContext(call), publicId);
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1667 locker.GetDicom().GetRawFrame(raw, mime, frame);
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1668 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1669
2408 26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1670 if (GzipCompression)
26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1671 {
26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1672 GzipCompressor gzip;
26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1673 std::string compressed;
26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1674 gzip.Compress(compressed, raw.empty() ? NULL : raw.c_str(), raw.size());
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	1675 call.GetOutput().AnswerBuffer(compressed, MimeType_Gzip);
2408 26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1676 }
26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1677 else
26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1678 {
26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1679 call.GetOutput().AnswerBuffer(raw, mime);
26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	1680 }
1924 6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1681 }
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1682
6c73df12ca51 New URI: "/instances/.../frames/.../raw" to access the raw frames (bypass image decoding) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1906 diff changeset	1683
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	1684 static void GetResourceStatistics(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1685 {
4418 9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1686 if (call.IsDocumentation())
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1687 {
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1688 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1689 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1690 call.GetDocumentation()
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1691 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1692 .SetSummary("Get " + r + " statistics")
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1693 .SetDescription("Get statistics about the given " + r)
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1694 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1695 .SetAnswerField("DiskSize", RestApiCallDocumentation::Type_String,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1696 "Size of the " + r + " on the disk in bytes, expressed as a string for 64bit compatibility with JSON")
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1697 .SetAnswerField("DiskSizeMB", RestApiCallDocumentation::Type_Number,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1698 "Size of the " + r + " on the disk, expressed in megabytes (MB)")
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1699 .SetAnswerField("UncompressedSize", RestApiCallDocumentation::Type_String,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1700 "Size of the " + r + " after decompression in bytes, expressed as a string for 64bit compatibility with JSON")
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1701 .SetAnswerField("UncompressedSizeMB", RestApiCallDocumentation::Type_Number,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1702 "Size of the " + r + " after decompression, expressed in megabytes (MB). "
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1703 "This is different from `DiskSizeMB` iff `StorageCompression` is `true`.")
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1704 .SetAnswerField("DicomDiskSize", RestApiCallDocumentation::Type_String,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1705 "Size on the disk of the DICOM instances associated with the " + r + ", expressed in bytes")
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1706 .SetAnswerField("DicomDiskSizeMB", RestApiCallDocumentation::Type_Number,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1707 "Size on the disk of the DICOM instances associated with the " + r + ", expressed in megabytes (MB)")
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1708 .SetAnswerField("DicomUncompressedSize", RestApiCallDocumentation::Type_String,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1709 "Size on the disk of the uncompressed DICOM instances associated with the " + r + ", expressed in bytes")
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1710 .SetAnswerField("DicomUncompressedSizeMB", RestApiCallDocumentation::Type_Number,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1711 "Size on the disk of the uncompressed DICOM instances associated with the " + r + ", expressed in megabytes (MB)")
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1712 .SetHttpGetSample(GetDocumentationSampleResource(t) + "/statistics", true);
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1713
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1714 switch (t)
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1715 {
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1716 // Do NOT add "break" below this point!
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1717 case ResourceType_Patient:
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1718 call.GetDocumentation().SetAnswerField("CountStudies", RestApiCallDocumentation::Type_Number,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1719 "Number of child studies within this " + r);
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1720
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1721 case ResourceType_Study:
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1722 call.GetDocumentation().SetAnswerField("CountSeries", RestApiCallDocumentation::Type_Number,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1723 "Number of child series within this " + r);
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1724
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1725 case ResourceType_Series:
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1726 call.GetDocumentation().SetAnswerField("CountInstances", RestApiCallDocumentation::Type_Number,
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1727 "Number of child instances within this " + r);
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1728
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1729 case ResourceType_Instance:
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1730 default:
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1731 break;
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1732 }
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1733
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1734 return;
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1735 }
9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	1736
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1737 static const uint64_t MEGA_BYTES = 1024 * 1024;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1738
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1739 std::string publicId = call.GetUriComponent("id", "");
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1740
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1741 ResourceType type;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1742 uint64_t diskSize, uncompressedSize, dicomDiskSize, dicomUncompressedSize;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1743 unsigned int countStudies, countSeries, countInstances;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1744 OrthancRestApi::GetIndex(call).GetResourceStatistics(
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1745 type, diskSize, uncompressedSize, countStudies, countSeries,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1746 countInstances, dicomDiskSize, dicomUncompressedSize, publicId);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1747
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1748 Json::Value result = Json::objectValue;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1749 result["DiskSize"] = boost::lexical_cast<std::string>(diskSize);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1750 result["DiskSizeMB"] = static_cast<unsigned int>(diskSize / MEGA_BYTES);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1751 result["UncompressedSize"] = boost::lexical_cast<std::string>(uncompressedSize);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1752 result["UncompressedSizeMB"] = static_cast<unsigned int>(uncompressedSize / MEGA_BYTES);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1753
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1754 result["DicomDiskSize"] = boost::lexical_cast<std::string>(dicomDiskSize);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1755 result["DicomDiskSizeMB"] = static_cast<unsigned int>(dicomDiskSize / MEGA_BYTES);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1756 result["DicomUncompressedSize"] = boost::lexical_cast<std::string>(dicomUncompressedSize);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1757 result["DicomUncompressedSizeMB"] = static_cast<unsigned int>(dicomUncompressedSize / MEGA_BYTES);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1758
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1759 switch (type)
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1760 {
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1761 // Do NOT add "break" below this point!
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1762 case ResourceType_Patient:
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1763 result["CountStudies"] = countStudies;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1764
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1765 case ResourceType_Study:
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1766 result["CountSeries"] = countSeries;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1767
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1768 case ResourceType_Series:
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1769 result["CountInstances"] = countInstances;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1770
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1771 case ResourceType_Instance:
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1772 default:
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1773 break;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1774 }
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3163 diff changeset	1775
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1776 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1777 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1778
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1779
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1780
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1781 // Handling of metadata -----------------------------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1782
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	1783 static void CheckValidResourceType(const RestApiCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1784 {
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1785 assert(!call.GetFullUri().empty());
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	1786 const std::string resourceType = call.GetFullUri() [0];
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1787 StringToResourceType(resourceType.c_str());
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1788 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1789
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1790
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	1791 static void ListMetadata(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1792 {
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1793 if (call.IsDocumentation())
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1794 {
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1795 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1796 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1797 call.GetDocumentation()
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1798 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1799 .SetSummary("List metadata")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1800 .SetDescription("Get the list of metadata that are associated with the given " + r)
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1801 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1802 .SetHttpGetArgument("expand", RestApiCallDocumentation::Type_String,
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1803 "If present, also retrieve the value of the individual metadata", false)
5274 e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1804 .SetHttpGetArgument("numeric", RestApiCallDocumentation::Type_String,
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1805 "If present, use the numeric identifier of the metadata instead of its symbolic name", false)
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1806 .AddAnswerType(MimeType_Json, "JSON array containing the names of the available metadata, "
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1807 "or JSON associative array mapping metadata to their values (if `expand` argument is provided)")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1808 .SetHttpGetSample(GetDocumentationSampleResource(t) + "/metadata", true);
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1809 return;
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1810 }
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1811
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1812 assert(!call.GetFullUri().empty());
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1813 const std::string publicId = call.GetUriComponent("id", "");
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1814 ResourceType level = StringToResourceType(call.GetFullUri() [0].c_str());
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1815
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1816 typedef std::map<MetadataType, std::string> Metadata;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1817
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1818 Metadata metadata;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1819 OrthancRestApi::GetIndex(call).GetAllMetadata(metadata, publicId, level);
2726 46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1820
46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1821 Json::Value result;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1822
5274 e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1823 bool isNumeric = call.HasArgument("numeric");
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1824
5405 62bb63346185 All 'expand' GET arguments now accepts expand=true and expand=false values + /studies/../instances now supports expand=false Alain Mazy <am@osimis.io> parents: 5393 diff changeset	1825 if (call.HasArgument("expand") && call.GetBooleanArgument("expand", true))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1826 {
2726 46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1827 result = Json::objectValue;
46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1828
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1829 for (Metadata::const_iterator it = metadata.begin(); it != metadata.end(); ++it)
2726 46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1830 {
5274 e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1831 std::string key;
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1832 if (isNumeric)
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1833 {
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1834 key = boost::lexical_cast<std::string>(it->first);
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1835 }
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1836 else
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1837 {
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1838 key = EnumerationToString(it->first);
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1839 }
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1840
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	1841 result[key] = it->second;
5274 e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1842 }
2726 46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1843 }
46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1844 else
46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1845 {
46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1846 result = Json::arrayValue;
46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1847
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1848 for (Metadata::const_iterator it = metadata.begin(); it != metadata.end(); ++it)
2726 46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1849 {
5274 e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1850 if (isNumeric)
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1851 {
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1852 result.append(it->first);
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1853 }
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1854 else
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1855 {
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1856 result.append(EnumerationToString(it->first));
e5b0bd6b2242 Added option "?numeric" if listing metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	1857 }
2726 46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2704 diff changeset	1858 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1859 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1860
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1861 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1862 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1863
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1864
4657 e8967149d87a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	1865 static void SetStringContentETag(const RestApiOutput& output,
e8967149d87a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	1866 int64_t revision,
e8967149d87a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	1867 const std::string& value)
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1868 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1869 std::string md5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1870 Toolbox::ComputeMD5(md5, value);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1871 const std::string etag = "\"" + boost::lexical_cast<std::string>(revision) + "-" + md5 + "\"";
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1872 output.GetLowLevelOutput().AddHeader("ETag", etag);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1873 }
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1874
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1875
4657 e8967149d87a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	1876 static void SetBufferContentETag(const RestApiOutput& output,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1877 int64_t revision,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1878 const void* data,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1879 size_t size)
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1880 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1881 std::string md5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1882 Toolbox::ComputeMD5(md5, data, size);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1883 const std::string etag = "\"" + boost::lexical_cast<std::string>(revision) + "-" + md5 + "\"";
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1884 output.GetLowLevelOutput().AddHeader("ETag", etag);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1885 }
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1886
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1887
4657 e8967149d87a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	1888 static void SetAttachmentETag(const RestApiOutput& output,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1889 int64_t revision,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1890 const FileInfo& info)
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1891 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1892 const std::string etag = ("\"" + boost::lexical_cast<std::string>(revision) + "-" +
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1893 info.GetUncompressedMD5() + "\"");
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1894 output.GetLowLevelOutput().AddHeader("ETag", etag);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1895 }
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1896
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1897
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1898 static std::string GetMD5(const std::string& value)
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1899 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1900 std::string md5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1901 Toolbox::ComputeMD5(md5, value);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1902 return md5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1903 }
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1904
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1905
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1906 static bool GetRevisionHeader(int64_t& revision /* out */,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1907 std::string& md5 /* out */,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1908 const RestApiCall& call,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1909 const std::string& header)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1910 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1911 std::string lower;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1912 Toolbox::ToLowerCase(lower, header);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1913
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1914 HttpToolbox::Arguments::const_iterator found = call.GetHttpHeaders().find(lower);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1915 if (found == call.GetHttpHeaders().end())
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1916 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1917 return false;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1918 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1919 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1920 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1921 std::string value = Toolbox::StripSpaces(found->second);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1922 Toolbox::RemoveSurroundingQuotes(value);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1923
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1924 try
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1925 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1926 size_t comma = value.find('-');
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1927 if (comma != std::string::npos)
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1928 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1929 revision = boost::lexical_cast<int64_t>(value.substr(0, comma));
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1930 md5 = value.substr(comma + 1);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1931 return true;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1932 }
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1933 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1934 catch (boost::bad_lexical_cast&)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1935 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1936 }
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1937
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1938 throw OrthancException(ErrorCode_ParameterOutOfRange, "The \"" + header +
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1939 "\" HTTP header should contain the ETag (revision followed by MD5 hash), but found: " + value);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1940 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1941 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1942
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1943
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	1944 static void GetMetadata(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1945 {
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1946 if (call.IsDocumentation())
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1947 {
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1948 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1949 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1950 call.GetDocumentation()
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1951 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1952 .SetSummary("Get metadata")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1953 .SetDescription("Get the value of a metadata that is associated with the given " + r)
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1954 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1955 .SetUriArgument("name", "The name of the metadata, or its index (cf. `UserMetadata` configuration option)")
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1956 .AddAnswerType(MimeType_PlainText, "Value of the metadata")
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1957 .SetAnswerHeader("ETag", "Revision of the metadata, to be used in further `PUT` or `DELETE` operations")
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1958 .SetHttpHeader("If-None-Match", "Optional revision of the metadata, to check if its content has changed");
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1959 return;
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1960 }
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1961
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1962 assert(!call.GetFullUri().empty());
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1963 const std::string publicId = call.GetUriComponent("id", "");
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1964 const ResourceType level = StringToResourceType(call.GetFullUri() [0].c_str());
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1965
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1966 std::string name = call.GetUriComponent("name", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1967 MetadataType metadata = StringToMetadata(name);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1968
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1969 std::string value;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1970 int64_t revision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1971 if (OrthancRestApi::GetIndex(call).LookupMetadata(value, revision, publicId, level, metadata))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1972 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1973 SetStringContentETag(call.GetOutput(), revision, value); // New in Orthanc 1.9.2
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1974
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1975 int64_t userRevision;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1976 std::string userMD5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1977 if (GetRevisionHeader(userRevision, userMD5, call, "If-None-Match") &&
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1978 userRevision == revision &&
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	1979 userMD5 == GetMD5(value))
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1980 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1981 call.GetOutput().GetLowLevelOutput().SendStatus(HttpStatus_304_NotModified);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1982 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1983 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1984 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1985 call.GetOutput().AnswerBuffer(value, MimeType_PlainText);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1986 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1987 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1988 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1989
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1990
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	1991 static void DeleteMetadata(RestApiDeleteCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1992 {
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1993 if (call.IsDocumentation())
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1994 {
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1995 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1996 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1997 call.GetDocumentation()
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1998 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	1999 .SetSummary("Delete metadata")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2000 .SetDescription("Delete some metadata associated with the given DICOM " + r +
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2001 ". This call will fail if trying to delete a system metadata (i.e. whose index is < 1024).")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2002 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2003 .SetUriArgument("name", "The name of the metadata, or its index (cf. `UserMetadata` configuration option)")
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2004 .SetHttpHeader("If-Match", "Revision of the metadata, to check if its content has not changed and can "
4661 b1d87d41874e typo: replaced "CheckRevision" by "CheckRevisions" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4657 diff changeset	2005 "be deleted. This header is mandatory if `CheckRevisions` option is `true`.");
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2006 return;
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2007 }
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2008
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2009 CheckValidResourceType(call);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2010 const std::string publicId = call.GetUriComponent("id", "");
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2011
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2012 std::string name = call.GetUriComponent("name", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2013 MetadataType metadata = StringToMetadata(name);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2014
5446 912565317b9a plugins are now allowed to modify/delete private metadata/attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5432 diff changeset	2015 if (IsUserMetadata(metadata) \|\| // It is forbidden to delete internal metadata...
912565317b9a plugins are now allowed to modify/delete private metadata/attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5432 diff changeset	2016 call.GetRequestOrigin() == RequestOrigin_Plugins) // ...except for plugins
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2017 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2018 bool found;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2019 int64_t revision;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2020 std::string md5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2021 if (GetRevisionHeader(revision, md5, call, "if-match"))
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2022 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2023 found = OrthancRestApi::GetIndex(call).DeleteMetadata(publicId, metadata, true, revision, md5);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2024 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2025 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2026 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2027 OrthancConfiguration::ReaderLock lock;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2028 if (lock.GetConfiguration().GetBooleanParameter(CHECK_REVISIONS, false))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2029 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2030 throw OrthancException(ErrorCode_Revision,
4661 b1d87d41874e typo: replaced "CheckRevision" by "CheckRevisions" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4657 diff changeset	2031 "HTTP header \"If-Match\" is missing, as \"CheckRevisions\" is \"true\"");
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2032 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2033 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2034 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2035 found = OrthancRestApi::GetIndex(call).DeleteMetadata(publicId, metadata, false, -1 /* dummy value */, "");
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2036 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2037 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2038
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2039 if (found)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2040 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2041 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2042 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2043 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2044 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2045 throw OrthancException(ErrorCode_UnknownResource);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2046 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2047 }
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2048 else
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2049 {
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2050 call.GetOutput().SignalError(HttpStatus_403_Forbidden);
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2051 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2052 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2053
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2054
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2055 static void SetMetadata(RestApiPutCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2056 {
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2057 if (call.IsDocumentation())
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2058 {
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2059 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2060 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2061 call.GetDocumentation()
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2062 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2063 .SetSummary("Set metadata")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2064 .SetDescription("Set the value of some metadata in the given DICOM " + r +
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2065 ". This call will fail if trying to modify a system metadata (i.e. whose index is < 1024).")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2066 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2067 .SetUriArgument("name", "The name of the metadata, or its index (cf. `UserMetadata` configuration option)")
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2068 .AddRequestType(MimeType_PlainText, "String value of the metadata")
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2069 .SetHttpHeader("If-Match", "Revision of the metadata, if this is not the first time this metadata is set.");
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2070 return;
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2071 }
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2072
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2073 CheckValidResourceType(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2074
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2075 std::string publicId = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2076 std::string name = call.GetUriComponent("name", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2077 MetadataType metadata = StringToMetadata(name);
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	2078
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	2079 std::string value;
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	2080 call.BodyToString(value);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2081
5446 912565317b9a plugins are now allowed to modify/delete private metadata/attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5432 diff changeset	2082 if (IsUserMetadata(metadata) \|\| // It is forbidden to modify internal metadata...
912565317b9a plugins are now allowed to modify/delete private metadata/attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5432 diff changeset	2083 call.GetRequestOrigin() == RequestOrigin_Plugins) // ...except for plugins
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2084 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2085 int64_t oldRevision;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2086 std::string oldMD5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2087 bool hasOldRevision = GetRevisionHeader(oldRevision, oldMD5, call, "if-match");
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2088
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2089 if (!hasOldRevision)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2090 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2091 OrthancConfiguration::ReaderLock lock;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2092 if (lock.GetConfiguration().GetBooleanParameter(CHECK_REVISIONS, false))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2093 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2094 // "StatelessDatabaseOperations::SetMetadata()" will ignore
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2095 // the actual value of "oldRevision" if the metadata is
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2096 // inexistent as expected
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2097 hasOldRevision = true;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2098 oldRevision = -1; // dummy value
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2099 oldMD5.clear(); // dummy value
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2100 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2101 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2102
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2103 int64_t newRevision;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2104 OrthancRestApi::GetIndex(call).SetMetadata(newRevision, publicId, metadata, value,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2105 hasOldRevision, oldRevision, oldMD5);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2106
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2107 SetStringContentETag(call.GetOutput(), newRevision, value); // New in Orthanc 1.9.2
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2108 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2109 }
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2110 else
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2111 {
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2112 call.GetOutput().SignalError(HttpStatus_403_Forbidden);
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2113 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2114 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2115
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2116
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2117
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2118 // Handling of labels -------------------------------------------------------
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2119
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2120 static void ListLabels(RestApiGetCall& call)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2121 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2122 if (call.IsDocumentation())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2123 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2124 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2125 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2126 call.GetDocumentation()
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2127 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
5275 8686476e9d12 fix inclusion of winsock.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 5274 diff changeset	2128 .SetSummary("List labels")
8686476e9d12 fix inclusion of winsock.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 5274 diff changeset	2129 .SetDescription("Get the labels that are associated with the given " + r + " (new in Orthanc 1.12.0)")
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2130 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2131 .AddAnswerType(MimeType_Json, "JSON array containing the names of the labels")
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2132 .SetHttpGetSample(GetDocumentationSampleResource(t) + "/labels", true);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2133 return;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2134 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2135
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2136 assert(!call.GetFullUri().empty());
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2137 const std::string publicId = call.GetUriComponent("id", "");
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2138 ResourceType level = StringToResourceType(call.GetFullUri() [0].c_str());
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2139
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2140 std::set<std::string> labels;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2141 OrthancRestApi::GetIndex(call).ListLabels(labels, publicId, level);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2142
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2143 Json::Value result = Json::arrayValue;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2144
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2145 for (std::set<std::string>::const_iterator it = labels.begin(); it != labels.end(); ++it)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2146 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2147 result.append(*it);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2148 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2149
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2150 call.GetOutput().AnswerJson(result);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2151 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2152
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2153
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2154 static void GetLabel(RestApiGetCall& call)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2155 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2156 if (call.IsDocumentation())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2157 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2158 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2159 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2160 call.GetDocumentation()
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2161 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2162 .SetSummary("Test label")
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2163 .SetDescription("Test whether the " + r + " is associated with the given label")
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2164 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2165 .SetUriArgument("label", "The label of interest")
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2166 .AddAnswerType(MimeType_PlainText, "Empty string is returned in the case of presence, error 404 in the case of absence");
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2167 return;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2168 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2169
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2170 CheckValidResourceType(call);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2171
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2172 assert(!call.GetFullUri().empty());
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2173 const std::string publicId = call.GetUriComponent("id", "");
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2174 const ResourceType level = StringToResourceType(call.GetFullUri() [0].c_str());
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2175
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2176 std::string label = call.GetUriComponent("label", "");
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2177
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2178 std::set<std::string> labels;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2179 OrthancRestApi::GetIndex(call).ListLabels(labels, publicId, level);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2180
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2181 if (labels.find(label) != labels.end())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2182 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2183 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2184 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2185 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2186
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2187
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2188 static void AddLabel(RestApiPutCall& call)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2189 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2190 if (call.IsDocumentation())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2191 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2192 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2193 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2194 call.GetDocumentation()
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2195 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2196 .SetSummary("Add label")
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2197 .SetDescription("Associate a label with a " + r)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2198 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2199 .SetUriArgument("label", "The label to be added");
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2200 return;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2201 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2202
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2203 CheckValidResourceType(call);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2204
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2205 std::string publicId = call.GetUriComponent("id", "");
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2206 const ResourceType level = StringToResourceType(call.GetFullUri() [0].c_str());
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2207
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2208 std::string label = call.GetUriComponent("label", "");
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2209 OrthancRestApi::GetIndex(call).ModifyLabel(publicId, level, label, StatelessDatabaseOperations::LabelOperation_Add);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2210
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2211 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2212 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2213
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2214
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2215 static void RemoveLabel(RestApiDeleteCall& call)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2216 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2217 if (call.IsDocumentation())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2218 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2219 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2220 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2221 call.GetDocumentation()
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2222 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2223 .SetSummary("Remove label")
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2224 .SetDescription("Remove a label associated with a " + r)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2225 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2226 .SetUriArgument("label", "The label to be removed");
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2227 return;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2228 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2229
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2230 CheckValidResourceType(call);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2231
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2232 std::string publicId = call.GetUriComponent("id", "");
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2233 const ResourceType level = StringToResourceType(call.GetFullUri() [0].c_str());
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2234
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2235 std::string label = call.GetUriComponent("label", "");
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2236 OrthancRestApi::GetIndex(call).ModifyLabel(publicId, level, label, StatelessDatabaseOperations::LabelOperation_Remove);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2237
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2238 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2239 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	2240
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2241
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2242 // Handling of attached files -----------------------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2243
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2244 static void ListAttachments(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2245 {
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2246 if (call.IsDocumentation())
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2247 {
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2248 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2249 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2250 call.GetDocumentation()
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2251 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2252 .SetSummary("List attachments")
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2253 .SetDescription("Get the list of attachments that are associated with the given " + r)
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2254 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
4853 b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2255 .SetHttpGetArgument("full", RestApiCallDocumentation::Type_String,
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2256 "If present, retrieve the attachments list and their numerical ids", false)
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2257 .AddAnswerType(MimeType_Json, "JSON array containing the names of the attachments")
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2258 .SetHttpGetSample(GetDocumentationSampleResource(t) + "/attachments", true);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2259 return;
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2260 }
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2261
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2262 const std::string resourceType = call.GetFullUri() [0];
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2263 const std::string publicId = call.GetUriComponent("id", "");
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4513 diff changeset	2264 std::set<FileContentType> attachments;
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2265 OrthancRestApi::GetIndex(call).ListAvailableAttachments(attachments, publicId, StringToResourceType(resourceType.c_str()));
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2266
4853 b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2267 Json::Value result;
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2268
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2269 if (call.HasArgument("full"))
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2270 {
4853 b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2271 result = Json::objectValue;
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2272
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2273 for (std::set<FileContentType>::const_iterator
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2274 it = attachments.begin(); it != attachments.end(); ++it)
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2275 {
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2276 std::string key = EnumerationToString(*it);
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2277 result[key] = static_cast<uint16_t>(*it);
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2278 }
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2279 }
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2280 else
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2281 {
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2282 result = Json::arrayValue;
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2283
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2284 for (std::set<FileContentType>::const_iterator
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2285 it = attachments.begin(); it != attachments.end(); ++it)
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2286 {
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2287 result.append(EnumerationToString(*it));
b3d0a3a4d890 Added links to download attachments from the Orthanc Explorer Alain Mazy <am@osimis.io> parents: 4836 diff changeset	2288 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2289 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2290
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2291 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2292 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2293
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2294
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2295 static void AddAttachmentDocumentation(RestApiGetCall& call,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2296 const std::string& resourceType)
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2297 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2298 call.GetDocumentation()
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2299 .SetUriArgument("id", "Orthanc identifier of the " + resourceType + " of interest")
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2300 .SetUriArgument("name", "The name of the attachment, or its index (cf. `UserContentType` configuration option)")
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2301 .SetAnswerHeader("ETag", "Revision of the attachment, to be used in further `PUT` or `DELETE` operations")
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2302 .SetHttpHeader("If-None-Match", "Optional revision of the attachment, to check if its content has changed");
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2303 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2304
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2305
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2306 static bool GetAttachmentInfo(FileInfo& info,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2307 RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2308 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2309 CheckValidResourceType(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2310
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2311 const std::string publicId = call.GetUriComponent("id", "");
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2312 const std::string name = call.GetUriComponent("name", "");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2313 FileContentType contentType = StringToContentType(name);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2314
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2315 int64_t revision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2316 if (OrthancRestApi::GetIndex(call).LookupAttachment(info, revision, publicId, contentType))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2317 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2318 SetAttachmentETag(call.GetOutput(), revision, info); // New in Orthanc 1.9.2
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2319
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2320 int64_t userRevision;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2321 std::string userMD5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2322 if (GetRevisionHeader(userRevision, userMD5, call, "If-None-Match") &&
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2323 revision == userRevision &&
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2324 info.GetUncompressedMD5() == userMD5)
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2325 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2326 call.GetOutput().GetLowLevelOutput().SendStatus(HttpStatus_304_NotModified);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2327 return false;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2328 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2329 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2330 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2331 return true;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2332 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2333 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2334 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2335 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2336 throw OrthancException(ErrorCode_UnknownResource);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2337 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2338 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2339
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2340
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2341 static void GetAttachmentOperations(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2342 {
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2343 if (call.IsDocumentation())
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2344 {
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2345 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2346 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2347 AddAttachmentDocumentation(call, r);
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2348 call.GetDocumentation()
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2349 .SetTag("Other")
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2350 .SetSummary("List operations on attachments")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2351 .SetDescription("Get the list of the operations that are available for attachments associated with the given " + r)
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2352 .AddAnswerType(MimeType_Json, "List of the available operations")
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	2353 .SetHttpGetSample("https://orthanc.uclouvain.be/demo/instances/6582b1c0-292ad5ab-ba0f088f-f7a1766f-9a29a54f/attachments/dicom", true);
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2354 return;
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2355 }
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2356
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2357 FileInfo info;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2358 if (GetAttachmentInfo(info, call))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2359 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2360 Json::Value operations = Json::arrayValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2361
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2362 operations.append("compress");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2363 operations.append("compressed-data");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2364
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2365 if (info.GetCompressedMD5() != "")
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2366 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2367 operations.append("compressed-md5");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2368 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2369
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2370 operations.append("compressed-size");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2371 operations.append("data");
4883 504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2372 operations.append("info");
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2373 operations.append("is-compressed");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2374
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2375 if (info.GetUncompressedMD5() != "")
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2376 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2377 operations.append("md5");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2378 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2379
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2380 operations.append("size");
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2381 operations.append("uncompress");
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2382
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2383 if (info.GetCompressedMD5() != "" &&
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2384 info.GetUncompressedMD5() != "")
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2385 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2386 operations.append("verify-md5");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2387 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2388
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2389 call.GetOutput().AnswerJson(operations);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2390 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2391 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2392
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2393
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2394 template <int uncompress>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2395 static void GetAttachmentData(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2396 {
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2397 if (call.IsDocumentation())
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2398 {
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2399 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2400 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2401 call.GetDocumentation()
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2402 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2403 .SetSummary("Get attachment" + std::string(uncompress ? "" : " (no decompression)"))
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2404 .SetDescription("Get the (binary) content of one attachment associated with the given " + r +
4418 9d6fa3da8f00 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	2405 std::string(uncompress ? "" : ". The attachment will not be decompressed if `StorageCompression` is `true`."))
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2406 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2407 .SetUriArgument("name", "The name of the attachment, or its index (cf. `UserContentType` configuration option)")
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2408 .AddAnswerType(MimeType_Binary, "The attachment")
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2409 .SetAnswerHeader("ETag", "Revision of the attachment, to be used in further `PUT` or `DELETE` operations")
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2410 .SetHttpHeader("If-None-Match", "Optional revision of the metadata, to check if its content has changed");
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2411 return;
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2412 }
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2413
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2414 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2415
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2416 CheckValidResourceType(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2417
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2418 std::string publicId = call.GetUriComponent("id", "");
1146 200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	2419 FileContentType type = StringToContentType(call.GetUriComponent("name", ""));
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2420
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2421 FileInfo info;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2422 if (GetAttachmentInfo(info, call))
1146 200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	2423 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2424 // NB: "SetAttachmentETag()" is already invoked by "GetAttachmentInfo()"
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2425
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2426 if (uncompress)
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2427 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2428 context.AnswerAttachment(call.GetOutput(), publicId, type);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2429 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2430 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2431 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2432 // Return the raw data (possibly compressed), as stored on the filesystem
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2433 std::string content;
5427 111e21b4f8bc fix transcoded instance caching Alain Mazy <am@osimis.io> parents: 5426 diff changeset	2434 std::string attachmentId;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2435 int64_t revision;
5427 111e21b4f8bc fix transcoded instance caching Alain Mazy <am@osimis.io> parents: 5426 diff changeset	2436 context.ReadAttachment(content, revision, attachmentId, publicId, type, false, true /* skipCache when you absolutely need the compressed data */);
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2437
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2438 int64_t userRevision;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2439 std::string userMD5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2440 if (GetRevisionHeader(userRevision, userMD5, call, "If-None-Match") &&
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2441 revision == userRevision &&
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2442 info.GetUncompressedMD5() == userMD5)
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2443 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2444 call.GetOutput().GetLowLevelOutput().SendStatus(HttpStatus_304_NotModified);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2445 }
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2446 else
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2447 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2448 call.GetOutput().AnswerBuffer(content, MimeType_Binary);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2449 }
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2450 }
1146 200fcac0deb4 optimization for access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 1145 diff changeset	2451 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2452 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2453
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2454
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2455 static void GetAttachmentSize(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2456 {
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2457 if (call.IsDocumentation())
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2458 {
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2459 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2460 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2461 AddAttachmentDocumentation(call, r);
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2462 call.GetDocumentation()
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2463 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2464 .SetSummary("Get size of attachment")
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2465 .SetDescription("Get the size of one attachment associated with the given " + r)
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2466 .AddAnswerType(MimeType_PlainText, "The size of the attachment");
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2467 return;
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2468 }
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2469
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2470 FileInfo info;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2471 if (GetAttachmentInfo(info, call))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2472 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2473 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetUncompressedSize()), MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2474 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2475 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2476
4883 504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2477 static void GetAttachmentInfo(RestApiGetCall& call)
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2478 {
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2479 if (call.IsDocumentation())
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2480 {
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2481 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2482 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2483 AddAttachmentDocumentation(call, r);
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2484 call.GetDocumentation()
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2485 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2486 .SetSummary("Get info about the attachment")
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2487 .SetDescription("Get all the information about the attachment associated with the given " + r)
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2488 .AddAnswerType(MimeType_Json, "JSON object containing the information about the attachment")
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	2489 .SetHttpGetSample("https://orthanc.uclouvain.be/demo/instances/7c92ce8e-bbf67ed2-ffa3b8c1-a3b35d94-7ff3ae26/attachments/dicom/info", true);
4883 504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2490 return;
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2491 }
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2492
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2493 FileInfo info;
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2494 if (GetAttachmentInfo(info, call))
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2495 {
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2496 Json::Value result = Json::objectValue;
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2497 result["Uuid"] = info.GetUuid();
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2498 result["ContentType"] = info.GetContentType();
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2499 result["UncompressedSize"] = Json::Value::UInt64(info.GetUncompressedSize());
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2500 result["CompressedSize"] = Json::Value::UInt64(info.GetCompressedSize());
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2501 result["UncompressedMD5"] = info.GetUncompressedMD5();
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2502 result["CompressedMD5"] = info.GetCompressedMD5();
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2503
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2504 call.GetOutput().AnswerJson(result);
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2505 }
504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	2506 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2507
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2508 static void GetAttachmentCompressedSize(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2509 {
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2510 if (call.IsDocumentation())
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2511 {
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2512 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2513 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2514 AddAttachmentDocumentation(call, r);
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2515 call.GetDocumentation()
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2516 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
4410 a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2517 .SetSummary("Get size of attachment on disk")
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2518 .SetDescription("Get the size of one attachment associated with the given " + r + ", as stored on the disk. "
4413 22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2519 "This is different from `.../size` iff `EnableStorage` is `true`.")
4410 a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2520 .AddAnswerType(MimeType_PlainText, "The size of the attachment, as stored on the disk");
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2521 return;
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2522 }
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	2523
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2524 FileInfo info;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2525 if (GetAttachmentInfo(info, call))
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2526 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2527 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetCompressedSize()), MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2528 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2529 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2530
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2531
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2532 static void GetAttachmentMD5(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2533 {
4410 a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2534 if (call.IsDocumentation())
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2535 {
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2536 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2537 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2538 AddAttachmentDocumentation(call, r);
4410 a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2539 call.GetDocumentation()
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2540 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2541 .SetSummary("Get MD5 of attachment")
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2542 .SetDescription("Get the MD5 hash of one attachment associated with the given " + r)
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2543 .AddAnswerType(MimeType_PlainText, "The MD5 of the attachment");
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2544 return;
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2545 }
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2546
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2547 FileInfo info;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2548 if (GetAttachmentInfo(info, call) &&
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2549 info.GetUncompressedMD5() != "")
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2550 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2551 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetUncompressedMD5()), MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2552 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2553 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2554
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2555
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2556 static void GetAttachmentCompressedMD5(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2557 {
4410 a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2558 if (call.IsDocumentation())
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2559 {
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2560 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2561 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2562 AddAttachmentDocumentation(call, r);
4410 a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2563 call.GetDocumentation()
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2564 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2565 .SetSummary("Get MD5 of attachment on disk")
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2566 .SetDescription("Get the MD5 hash of one attachment associated with the given " + r + ", as stored on the disk. "
4413 22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2567 "This is different from `.../md5` iff `EnableStorage` is `true`.")
4410 a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2568 .AddAnswerType(MimeType_PlainText, "The MD5 of the attachment, as stored on the disk");
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2569 return;
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2570 }
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2571
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2572 FileInfo info;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2573 if (GetAttachmentInfo(info, call) &&
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2574 info.GetCompressedMD5() != "")
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2575 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2576 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetCompressedMD5()), MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2577 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2578 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2579
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2580
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2581 static void VerifyAttachment(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2582 {
4410 a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2583 if (call.IsDocumentation())
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2584 {
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2585 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2586 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2587 call.GetDocumentation()
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2588 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2589 .SetSummary("Verify attachment")
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2590 .SetDescription("Verify that the attachment is not corrupted, by validating its MD5 hash")
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2591 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2592 .SetUriArgument("name", "The name of the attachment, or its index (cf. `UserContentType` configuration option)")
4410 a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2593 .AddAnswerType(MimeType_Json, "On success, a valid JSON object is returned");
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2594 return;
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2595 }
a6abe5f512db cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4409 diff changeset	2596
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2597 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2598 CheckValidResourceType(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2599
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2600 std::string publicId = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2601 std::string name = call.GetUriComponent("name", "");
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2602 FileContentType contentType = StringToContentType(name);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2603
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2604 FileInfo info;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2605 int64_t revision; // Ignored
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2606 if (!OrthancRestApi::GetIndex(call).LookupAttachment(info, revision, publicId, contentType) \|\|
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2607 info.GetCompressedMD5() == "" \|\|
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2608 info.GetUncompressedMD5() == "")
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2609 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2610 // Inexistent resource, or no MD5 available
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2611 return;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2612 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2613
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2614 bool ok = false;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2615
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2616 // First check whether the compressed data is correctly stored in the disk
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2617 std::string data;
5427 111e21b4f8bc fix transcoded instance caching Alain Mazy <am@osimis.io> parents: 5426 diff changeset	2618 std::string attachmentId;
111e21b4f8bc fix transcoded instance caching Alain Mazy <am@osimis.io> parents: 5426 diff changeset	2619
111e21b4f8bc fix transcoded instance caching Alain Mazy <am@osimis.io> parents: 5426 diff changeset	2620 context.ReadAttachment(data, revision, attachmentId, publicId, StringToContentType(name), false, true /* skipCache when you absolutely need the compressed data */);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2621
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2622 std::string actualMD5;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2623 Toolbox::ComputeMD5(actualMD5, data);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2624
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2625 if (actualMD5 == info.GetCompressedMD5())
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2626 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2627 // The compressed data is OK. If a compression algorithm was
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2628 // applied to it, now check the MD5 of the uncompressed data.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2629 if (info.GetCompressionType() == CompressionType_None)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2630 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2631 ok = true;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2632 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2633 else
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2634 {
5427 111e21b4f8bc fix transcoded instance caching Alain Mazy <am@osimis.io> parents: 5426 diff changeset	2635 context.ReadAttachment(data, revision, attachmentId, publicId, StringToContentType(name), true, true /* skipCache when you absolutely need the compressed data */);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2636 Toolbox::ComputeMD5(actualMD5, data);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2637 ok = (actualMD5 == info.GetUncompressedMD5());
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2638 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2639 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2640
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2641 if (ok)
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2642 {
4294 0923247e69f6 log categories: rest -> http + added lua & jobs Alain Mazy <alain@mazy.be> parents: 4272 diff changeset	2643 CLOG(INFO, HTTP) << "The attachment " << name << " of resource " << publicId << " has the right MD5";
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2644 call.GetOutput().AnswerBuffer("{}", MimeType_Json);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2645 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2646 else
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2647 {
4294 0923247e69f6 log categories: rest -> http + added lua & jobs Alain Mazy <alain@mazy.be> parents: 4272 diff changeset	2648 CLOG(INFO, HTTP) << "The attachment " << name << " of resource " << publicId << " has bad MD5!";
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2649 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2650 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2651
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2652
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2653 static void UploadAttachment(RestApiPutCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2654 {
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2655 if (call.IsDocumentation())
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2656 {
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2657 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2658 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2659 call.GetDocumentation()
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2660 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2661 .SetSummary("Set attachment")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2662 .SetDescription("Attach a file to the given DICOM " + r +
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2663 ". This call will fail if trying to modify a system attachment (i.e. whose index is < 1024).")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2664 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2665 .SetUriArgument("name", "The name of the attachment, or its index (cf. `UserContentType` configuration option)")
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2666 .AddRequestType(MimeType_Binary, "Binary data containing the attachment")
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2667 .AddAnswerType(MimeType_Json, "Empty JSON object in the case of a success")
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2668 .SetHttpHeader("If-Match", "Revision of the attachment, if this is not the first time this attachment is set.");
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2669 return;
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2670 }
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2671
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2672 ServerContext& context = OrthancRestApi::GetContext(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2673 CheckValidResourceType(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2674
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2675 std::string publicId = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2676 std::string name = call.GetUriComponent("name", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2677
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2678 FileContentType contentType = StringToContentType(name);
5446 912565317b9a plugins are now allowed to modify/delete private metadata/attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5432 diff changeset	2679 if (IsUserContentType(contentType) \|\| // It is forbidden to modify internal attachments...
912565317b9a plugins are now allowed to modify/delete private metadata/attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5432 diff changeset	2680 call.GetRequestOrigin() == RequestOrigin_Plugins) // ...except for plugins
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2681 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2682 int64_t oldRevision;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2683 std::string oldMD5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2684 bool hasOldRevision = GetRevisionHeader(oldRevision, oldMD5, call, "if-match");
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2685
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2686 if (!hasOldRevision)
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2687 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2688 OrthancConfiguration::ReaderLock lock;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2689 if (lock.GetConfiguration().GetBooleanParameter(CHECK_REVISIONS, false))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2690 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2691 // "StatelessDatabaseOperations::AddAttachment()" will ignore
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2692 // the actual value of "oldRevision" if the metadata is
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2693 // inexistent as expected
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2694 hasOldRevision = true;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2695 oldRevision = -1; // dummy value
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2696 oldMD5.clear(); // dummy value
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2697 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2698 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2699
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2700 int64_t newRevision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2701 context.AddAttachment(newRevision, publicId, StringToContentType(name), call.GetBodyData(),
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2702 call.GetBodySize(), hasOldRevision, oldRevision, oldMD5);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2703
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2704 SetBufferContentETag(call.GetOutput(), newRevision, call.GetBodyData(), call.GetBodySize()); // New in Orthanc 1.9.2
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2705 call.GetOutput().AnswerBuffer("{}", MimeType_Json);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2706 }
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2707 else
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2708 {
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2709 call.GetOutput().SignalError(HttpStatus_403_Forbidden);
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2710 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2711 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2712
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2713
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2714 static void DeleteAttachment(RestApiDeleteCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2715 {
4413 22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2716 if (call.IsDocumentation())
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2717 {
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2718 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2719 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2720 call.GetDocumentation()
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2721 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2722 .SetSummary("Delete attachment")
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2723 .SetDescription("Delete an attachment associated with the given DICOM " + r +
d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2724 ". This call will fail if trying to delete a system attachment (i.e. whose index is < 1024).")
4413 22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2725 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2726 .SetUriArgument("name", "The name of the attachment, or its index (cf. `UserContentType` configuration option)")
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2727 .SetHttpHeader("If-Match", "Revision of the attachment, to check if its content has not changed and can "
4661 b1d87d41874e typo: replaced "CheckRevision" by "CheckRevisions" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4657 diff changeset	2728 "be deleted. This header is mandatory if `CheckRevisions` option is `true`.");
4413 22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2729 return;
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2730 }
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2731
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2732 CheckValidResourceType(call);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2733
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2734 std::string publicId = call.GetUriComponent("id", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2735 std::string name = call.GetUriComponent("name", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2736 FileContentType contentType = StringToContentType(name);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2737
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2738 bool allowed;
5446 912565317b9a plugins are now allowed to modify/delete private metadata/attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5432 diff changeset	2739 if (IsUserContentType(contentType) \|\| // It is forbidden to delete internal attachments...
912565317b9a plugins are now allowed to modify/delete private metadata/attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5432 diff changeset	2740 call.GetRequestOrigin() == RequestOrigin_Plugins) // ...except for plugins
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2741 {
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2742 allowed = true;
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2743 }
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2744 else
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2745 {
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2746 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2747
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2748 if (lock.GetConfiguration().GetBooleanParameter("StoreDicom", true) &&
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2749 contentType == FileContentType_DicomAsJson)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2750 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2751 allowed = true;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2752 }
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2753 else
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2754 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2755 // It is forbidden to delete internal attachments, except for
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2756 // the "DICOM as JSON" summary as of Orthanc 1.2.0 (this summary
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2757 // would be automatically reconstructed on the next GET call)
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2758 allowed = false;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2935 diff changeset	2759 }
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2760 }
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2761
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2762 if (allowed)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2763 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2764 bool found;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2765 int64_t revision;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2766 std::string md5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2767 if (GetRevisionHeader(revision, md5, call, "if-match"))
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2768 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2769 found = OrthancRestApi::GetIndex(call).DeleteAttachment(publicId, contentType, true, revision, md5);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2770 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2771 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2772 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2773 OrthancConfiguration::ReaderLock lock;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2774 if (lock.GetConfiguration().GetBooleanParameter(CHECK_REVISIONS, false))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2775 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2776 throw OrthancException(ErrorCode_Revision,
4661 b1d87d41874e typo: replaced "CheckRevision" by "CheckRevisions" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4657 diff changeset	2777 "HTTP header \"If-Match\" is missing, as \"CheckRevisions\" is \"true\"");
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2778 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2779 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2780 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2781 found = OrthancRestApi::GetIndex(call).DeleteAttachment(publicId, contentType,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	2782 false, -1 /* dummy value /, "" / dummy value */);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2783 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2784 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2785
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2786 if (found)
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2787 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2788 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2789 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2790 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2791 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2792 throw OrthancException(ErrorCode_UnknownResource);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2793 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2794 }
2128 9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2795 else
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2796 {
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2797 call.GetOutput().SignalError(HttpStatus_403_Forbidden);
9329ba17a069 Possibility to DELETE "dicom-as-json" attachments to reconstruct them Sebastien Jodogne <s.jodogne@gmail.com> parents: 2127 diff changeset	2798 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2799 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2800
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2801
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2802 template <enum CompressionType compression>
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2803 static void ChangeAttachmentCompression(RestApiPostCall& call)
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2804 {
4413 22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2805 if (call.IsDocumentation())
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2806 {
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2807 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2808 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2809 call.GetDocumentation()
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2810 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2811 .SetSummary(compression == CompressionType_None ? "Uncompress attachment" : "Compress attachment")
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2812 .SetDescription("Change the compression scheme that is used to store an attachment.")
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2813 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
4414 d928dfcacb4b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4413 diff changeset	2814 .SetUriArgument("name", "The name of the attachment, or its index (cf. `UserContentType` configuration option)");
4413 22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2815 return;
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2816 }
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2817
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2818 CheckValidResourceType(call);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2819
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2820 std::string publicId = call.GetUriComponent("id", "");
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2821 std::string name = call.GetUriComponent("name", "");
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2822 FileContentType contentType = StringToContentType(name);
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2823
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2824 OrthancRestApi::GetContext(call).ChangeAttachmentCompression(publicId, contentType, compression);
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2825 call.GetOutput().AnswerBuffer("{}", MimeType_Json);
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2826 }
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2827
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2828
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2829 static void IsAttachmentCompressed(RestApiGetCall& call)
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2830 {
4413 22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2831 if (call.IsDocumentation())
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2832 {
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2833 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2834 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2835 AddAttachmentDocumentation(call, r);
4413 22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2836 call.GetDocumentation()
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2837 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2838 .SetSummary("Is attachment compressed?")
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2839 .SetDescription("Test whether the attachment has been stored as a compressed file on the disk.")
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2840 .AddAnswerType(MimeType_PlainText, "`0` if the attachment was stored uncompressed, `1` if it was compressed");
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2841 return;
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2842 }
22a1352a0823 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4410 diff changeset	2843
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2844 FileInfo info;
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2845 if (GetAttachmentInfo(info, call))
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2846 {
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2847 std::string answer = (info.GetCompressionType() == CompressionType_None) ? "0" : "1";
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	2848 call.GetOutput().AnswerBuffer(answer, MimeType_PlainText);
1700 f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2849 }
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2850 }
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2851
f5ddbd9239dd New URIs for attachments: ".../compress", ".../uncompress" and ".../is-compressed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1556 diff changeset	2852
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	2853 // Raw access to the DICOM tags of an instance ------------------------------
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	2854
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2855 static void GetRawContent(RestApiGetCall& call)
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	2856 {
4405 5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2857 if (call.IsDocumentation())
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2858 {
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2859 call.GetDocumentation()
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2860 .SetTag("Instances")
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2861 .SetSummary("Get raw tag")
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2862 .SetDescription("Get the raw content of one DICOM tag in the hierarchy of DICOM dataset")
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2863 .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
5393 c5c00bee291a in openapi generator: renamed '...' into 'path' since '...' is an invalid name Alain Mazy <am@osimis.io> parents: 5392 diff changeset	2864 .SetUriArgument("path", "Path to the DICOM tag. This is the interleaving of one DICOM tag, possibly followed "
4405 5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2865 "by an index for sequences. Sequences are accessible as, for instance, `/0008-1140/1/0008-1150`")
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2866 .AddAnswerType(MimeType_Binary, "The raw value of the tag of intereset "
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2867 "(binary data, whose memory layout depends on the underlying transfer syntax), "
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2868 "or JSON array containing the list of available tags if accessing a dataset");
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2869 return;
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2870 }
5466f336b09f gathering statistics about progress of api documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4404 diff changeset	2871
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	2872 std::string id = call.GetUriComponent("id", "");
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	2873
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	2874 ServerContext::DicomCacheLocker locker(OrthancRestApi::GetContext(call), id);
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	2875
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	2876 locker.GetDicom().SendPathValue(call.GetOutput(), call.GetTrailingUri());
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	2877 }
a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	2878
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2879
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2880
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2881 static bool ExtractSharedTags(Json::Value& shared,
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2882 ServerContext& context,
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2883 const std::string& publicId)
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2884 {
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2885 // Retrieve all the instances of this patient/study/series
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2886 typedef std::list<std::string> Instances;
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2887 Instances instances;
959 bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2888 context.GetIndex().GetChildInstances(instances, publicId); // (*)
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2889
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2890 // Loop over the instances
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2891 bool isFirst = true;
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2892 shared = Json::objectValue;
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2893
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2894 for (Instances::const_iterator it = instances.begin();
1303 bba8a47922d1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	2895 it != instances.end(); ++it)
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2896 {
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2897 // Get the tags of the current instance, in the simplified format
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2898 Json::Value tags;
959 bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2899
bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2900 try
bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2901 {
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2122 diff changeset	2902 context.ReadDicomAsJson(tags, *it);
959 bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2903 }
bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2904 catch (OrthancException&)
bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2905 {
bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2906 // Race condition: This instance has been removed since
bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2907 // (*). Ignore this instance.
bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2908 continue;
bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2909 }
bd5659f2a50a fix possible race condition Sebastien Jodogne <s.jodogne@gmail.com> parents: 958 diff changeset	2910
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2911 if (tags.type() != Json::objectValue)
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2912 {
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2913 return false; // Error
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2914 }
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2915
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2916 // Only keep the tags that are mapped to a string
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2917 Json::Value::Members members = tags.getMemberNames();
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2918 for (size_t i = 0; i < members.size(); i++)
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2919 {
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2920 const Json::Value& tag = tags[members[i]];
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2921 if (tag.type() != Json::objectValue \|\|
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2922 tag["Type"].type() != Json::stringValue \|\|
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2923 tag["Type"].asString() != "String")
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2924 {
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2925 tags.removeMember(members[i]);
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2926 }
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2927 }
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2928
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2929 if (isFirst)
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2930 {
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2931 // This is the first instance, keep its tags as such
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2932 shared = tags;
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2933 isFirst = false;
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2934 }
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2935 else
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2936 {
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2937 // Loop over all the members of the shared tags extracted so
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2938 // far. If the value of one of these tags does not match its
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2939 // value in the current instance, remove it.
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2940 members = shared.getMemberNames();
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2941 for (size_t i = 0; i < members.size(); i++)
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2942 {
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2943 if (!tags.isMember(members[i]) \|\|
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2944 tags[members[i]]["Value"].asString() != shared[members[i]]["Value"].asString())
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2945 {
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2946 shared.removeMember(members[i]);
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2947 }
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2948 }
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2949 }
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2950 }
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2951
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2952 return true;
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2953 }
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2954
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2955
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 964 diff changeset	2956 static void GetSharedTags(RestApiGetCall& call)
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2957 {
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2958 if (call.IsDocumentation())
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2959 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2960 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Full);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2961
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2962 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2963 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2964 call.GetDocumentation()
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2965 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2966 .SetSummary("Get shared tags")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2967 .SetDescription("Extract the DICOM tags whose value is constant across all the child instances of "
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2968 "the DICOM " + r + " whose Orthanc identifier is provided in the URL")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2969 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2970 .AddAnswerType(MimeType_Json, "JSON object containing the values of the DICOM tags")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2971 .SetTruncatedJsonHttpGetSample(GetDocumentationSampleResource(t) + "/shared-tags", 5);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2972 return;
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2973 }
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	2974
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2975 ServerContext& context = OrthancRestApi::GetContext(call);
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2976 std::string publicId = call.GetUriComponent("id", "");
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2977
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2978 Json::Value sharedTags;
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2979 if (ExtractSharedTags(sharedTags, context, publicId))
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2980 {
abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2981 // Success: Send the value of the shared tags
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2982 AnswerDicomAsJson(call, sharedTags, OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Full));
960 abac5c83134f simplified and extensive shared-tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 959 diff changeset	2983 }
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2984 }
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2985
1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	2986
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2987 template <enum ResourceType resourceType,
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2988 enum DicomModule module>
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2989 static void GetModule(RestApiGetCall& call)
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	2990 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2991 if (call.IsDocumentation())
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2992 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2993 const std::string resource = GetResourceTypeText(resourceType, false /* plural /, false / lower case */);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2994 std::string m;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2995 switch (module)
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2996 {
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2997 case DicomModule_Patient:
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2998 m = "patient";
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	2999 break;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3000 case DicomModule_Study:
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3001 m = "study";
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3002 break;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3003 case DicomModule_Series:
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3004 m = "series";
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3005 break;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3006 case DicomModule_Instance:
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3007 m = "instance";
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3008 break;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3009 default:
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3010 throw OrthancException(ErrorCode_ParameterOutOfRange);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3011 }
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3012
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3013 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Full);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3014
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3015 call.GetDocumentation()
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3016 .SetTag(GetResourceTypeText(resourceType, true /* plural /, true / upper case */))
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3017 .SetSummary("Get " + m + " module" + std::string(resource == m ? "" : " of " + resource))
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3018 .SetDescription("Get the " + m + " module of the DICOM " + resource + " whose Orthanc identifier is provided in the URL")
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3019 .SetUriArgument("id", "Orthanc identifier of the " + resource + " of interest")
4722 2b4da0ee6b73 added missing documentation of "ignore-length" in "/instances/{id}/tags" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4716 diff changeset	3020 .SetHttpGetArgument(IGNORE_LENGTH, RestApiCallDocumentation::Type_JsonListOfStrings,
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3021 "Also include the DICOM tags that are provided in this list, even if their associated value is long", false)
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3022 .AddAnswerType(MimeType_Json, "Information about the DICOM " + resource)
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3023 .SetHttpGetSample(GetDocumentationSampleResource(resourceType) + "/" + (*call.GetFullUri().rbegin()), true);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3024 return;
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3025 }
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3026
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	3027 if (!((resourceType == ResourceType_Patient && module == DicomModule_Patient) \|\|
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	3028 (resourceType == ResourceType_Study && module == DicomModule_Patient) \|\|
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	3029 (resourceType == ResourceType_Study && module == DicomModule_Study) \|\|
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	3030 (resourceType == ResourceType_Series && module == DicomModule_Series) \|\|
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	3031 (resourceType == ResourceType_Instance && module == DicomModule_Instance) \|\|
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	3032 (resourceType == ResourceType_Instance && module == DicomModule_Image)))
1054 1701dcb6f554 Access patient module at the study level to cope with PatientID collisions Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	3033 {
1701dcb6f554 Access patient module at the study level to cope with PatientID collisions Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	3034 throw OrthancException(ErrorCode_NotImplemented);
1701dcb6f554 Access patient module at the study level to cope with PatientID collisions Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	3035 }
1701dcb6f554 Access patient module at the study level to cope with PatientID collisions Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	3036
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3037 ServerContext& context = OrthancRestApi::GetContext(call);
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3038 std::string publicId = call.GetUriComponent("id", "");
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3039
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	3040 std::set<DicomTag> ignoreTagLength;
4722 2b4da0ee6b73 added missing documentation of "ignore-length" in "/instances/{id}/tags" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4716 diff changeset	3041 ParseSetOfTags(ignoreTagLength, call, IGNORE_LENGTH);
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	3042
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	3043 typedef std::set<DicomTag> ModuleTags;
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	3044 ModuleTags moduleTags;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1361 diff changeset	3045 DicomTag::AddTagsForModule(moduleTags, module);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3046
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3047 Json::Value tags;
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3048
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3049 if (resourceType != ResourceType_Instance)
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3050 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3051 // Retrieve all the instances of this patient/study/series
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3052 typedef std::list<std::string> Instances;
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3053 Instances instances;
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3054 context.GetIndex().GetChildInstances(instances, publicId);
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3055
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3056 if (instances.empty())
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3057 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3058 return; // Error: No instance (should never happen)
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3059 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3060
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3061 // Select one child instance
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3062 publicId = instances.front();
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3063 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3064
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	3065 context.ReadDicomAsJson(tags, publicId, ignoreTagLength);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3066
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3067 // Filter the tags of the instance according to the module
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3068 Json::Value result = Json::objectValue;
1303 bba8a47922d1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	3069 for (ModuleTags::const_iterator tag = moduleTags.begin(); tag != moduleTags.end(); ++tag)
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3070 {
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	3071 std::string s = tag->Format();
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3072 if (tags.isMember(s))
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3073 {
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3074 result[s] = tags[s];
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3075 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3076 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3077
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3078 AnswerDicomAsJson(call, result, OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Full));
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3079 }
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3080
81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	3081
1722 f1901004f3e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1719 diff changeset	3082 namespace
f1901004f3e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1719 diff changeset	3083 {
f1901004f3e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1719 diff changeset	3084 typedef std::list< std::pair<ResourceType, std::string> > LookupResults;
f1901004f3e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1719 diff changeset	3085 }
f1901004f3e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1719 diff changeset	3086
f1901004f3e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1719 diff changeset	3087
f1901004f3e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1719 diff changeset	3088 static void AccumulateLookupResults(LookupResults& result,
1718 2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1703 diff changeset	3089 ServerIndex& index,
2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1703 diff changeset	3090 const DicomTag& tag,
1719 3b1f7e706d38 fix Orthanc.test_lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1718 diff changeset	3091 const std::string& value,
3b1f7e706d38 fix Orthanc.test_lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1718 diff changeset	3092 ResourceType level)
1718 2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1703 diff changeset	3093 {
3034 54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	3094 std::vector<std::string> tmp;
1728 4941494b5dd8 rename LookupIdentifier as LookupIdentifierExact Sebastien Jodogne <s.jodogne@gmail.com> parents: 1727 diff changeset	3095 index.LookupIdentifierExact(tmp, level, tag, value);
1719 3b1f7e706d38 fix Orthanc.test_lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1718 diff changeset	3096
3034 54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	3097 for (size_t i = 0; i < tmp.size(); i++)
1719 3b1f7e706d38 fix Orthanc.test_lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1718 diff changeset	3098 {
3034 54e422fe31ce moving LookupResource to graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 3033 diff changeset	3099 result.push_back(std::make_pair(level, tmp[i]));
1719 3b1f7e706d38 fix Orthanc.test_lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1718 diff changeset	3100 }
1718 2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1703 diff changeset	3101 }
2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1703 diff changeset	3102
2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1703 diff changeset	3103
1139 f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3104 static void Lookup(RestApiPostCall& call)
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3105 {
4422 48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3106 if (call.IsDocumentation())
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3107 {
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3108 call.GetDocumentation()
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3109 .SetTag("System")
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3110 .SetSummary("Look for DICOM identifiers")
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3111 .SetDescription("This URI can be used to convert one DICOM identifier to a list of matching Orthanc resources")
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3112 .AddRequestType(MimeType_PlainText, "The DICOM identifier of interest (i.e. the value of `PatientID`, "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3113 "`StudyInstanceUID`, `SeriesInstanceUID`, or `SOPInstanceUID`)")
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3114 .AddAnswerType(MimeType_Json, "JSON array containing a list of matching Orthanc resources, each item in the "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3115 "list corresponding to a JSON object with the fields `Type`, `ID` and `Path` identifying one "
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3116 "DICOM resource that is stored by Orthanc");
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3117 return;
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3118 }
48303e493135 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4421 diff changeset	3119
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	3120 std::string tag;
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	3121 call.BodyToString(tag);
1139 f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3122
1722 f1901004f3e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1719 diff changeset	3123 LookupResults resources;
1718 2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1703 diff changeset	3124 ServerIndex& index = OrthancRestApi::GetIndex(call);
1719 3b1f7e706d38 fix Orthanc.test_lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1718 diff changeset	3125 AccumulateLookupResults(resources, index, DICOM_TAG_PATIENT_ID, tag, ResourceType_Patient);
3b1f7e706d38 fix Orthanc.test_lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1718 diff changeset	3126 AccumulateLookupResults(resources, index, DICOM_TAG_STUDY_INSTANCE_UID, tag, ResourceType_Study);
3b1f7e706d38 fix Orthanc.test_lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1718 diff changeset	3127 AccumulateLookupResults(resources, index, DICOM_TAG_SERIES_INSTANCE_UID, tag, ResourceType_Series);
3b1f7e706d38 fix Orthanc.test_lookup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1718 diff changeset	3128 AccumulateLookupResults(resources, index, DICOM_TAG_SOP_INSTANCE_UID, tag, ResourceType_Instance);
1718 2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1703 diff changeset	3129
2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1703 diff changeset	3130 Json::Value result = Json::arrayValue;
1722 f1901004f3e4 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1719 diff changeset	3131 for (LookupResults::const_iterator
1718 2b812969e136 getting rid of an IDatabaseWrapper::LookupIdentifier flavor Sebastien Jodogne <s.jodogne@gmail.com> parents: 1703 diff changeset	3132 it = resources.begin(); it != resources.end(); ++it)
1139 f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3133 {
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3134 ResourceType type = it->first;
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3135 const std::string& id = it->second;
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3136
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3137 Json::Value item = Json::objectValue;
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3138 item["Type"] = EnumerationToString(type);
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3139 item["ID"] = id;
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3140 item["Path"] = GetBasePath(type, id);
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3141
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3142 result.append(item);
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3143 }
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3144
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3145 call.GetOutput().AnswerJson(result);
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3146 }
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3147
f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	3148
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3149 namespace
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3150 {
3021 2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	3151 class FindVisitor : public ServerContext::ILookupVisitor
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3152 {
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3153 private:
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3154 bool isComplete_;
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3155 std::list<std::string> resources_;
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	3156 FindStorageAccessMode findStorageAccessMode_;
4937 3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	3157
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	3158 // cache the data we used during lookup and that we could reuse when building the answers
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	3159 std::map<std::string, std::string> instancesIds_; // the id of an instance for each found resource.
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	3160 std::map<std::string, boost::shared_ptr<DicomMap> > resourcesMainDicomTags_; // all tags read from DB for a resource (current level and upper levels)
5060 e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	3161 std::map<std::string, boost::shared_ptr<Json::Value> > resourcesDicomAsJson_; // the dicom-as-json for a resource
4937 3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	3162
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3163 DicomToJsonFormat format_;
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3164
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3165 public:
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	3166 explicit FindVisitor(DicomToJsonFormat format, FindStorageAccessMode findStorageAccessMode) :
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3167 isComplete_(false),
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	3168 findStorageAccessMode_(findStorageAccessMode),
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3169 format_(format)
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3170 {
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3171 }
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	3172
d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	3173 virtual bool IsDicomAsJsonNeeded() const ORTHANC_OVERRIDE
3012 af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3003 diff changeset	3174 {
af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3003 diff changeset	3175 return false; // (*)
af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3003 diff changeset	3176 }
af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3003 diff changeset	3177
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	3178 virtual void MarkAsComplete() ORTHANC_OVERRIDE
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3179 {
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3180 isComplete_ = true; // Unused information as of Orthanc 1.5.0
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3181 }
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3182
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3183 virtual void Visit(const std::string& publicId,
4937 3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	3184 const std::string& instanceId,
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	3185 const DicomMap& mainDicomTags,
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	3186 const Json::Value* dicomAsJson) ORTHANC_OVERRIDE
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3187 {
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3188 resources_.push_back(publicId);
4937 3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	3189 instancesIds_[publicId] = instanceId;
3f9b9865c8cc include requested tags from storage if needed Alain Mazy <am@osimis.io> parents: 4936 diff changeset	3190 resourcesMainDicomTags_[publicId].reset(mainDicomTags.Clone());
5060 e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	3191 if (dicomAsJson != NULL)
e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	3192 {
e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	3193 resourcesDicomAsJson_[publicId].reset(new Json::Value(*dicomAsJson)); // keep our own copy because we might reuse it between lookup and answers
e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	3194 }
e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	3195 else
e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	3196 {
e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	3197 resourcesDicomAsJson_[publicId] = boost::shared_ptr<Json::Value>();
e69a3ff39bc5 fix reuse of DicomAsJson between lookup and answers Alain Mazy <am@osimis.io> parents: 5058 diff changeset	3198 }
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3199 }
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3200
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3201 void Answer(RestApiOutput& output,
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	3202 ServerContext& context,
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3203 ResourceType level,
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3204 bool expand,
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3205 const std::set<DicomTag>& requestedTags) const
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3206 {
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	3207 AnswerListOfResources1(output, context, resources_, instancesIds_, resourcesMainDicomTags_, resourcesDicomAsJson_, level, expand, format_, requestedTags, IsStorageAccessAllowedForAnswers(findStorageAccessMode_));
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3208 }
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3209 };
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3210 }
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3211
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3212
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3213 static void Find(RestApiPostCall& call)
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3214 {
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3215 static const char* const KEY_CASE_SENSITIVE = "CaseSensitive";
0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3216 static const char* const KEY_EXPAND = "Expand";
0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3217 static const char* const KEY_LEVEL = "Level";
0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3218 static const char* const KEY_LIMIT = "Limit";
0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3219 static const char* const KEY_QUERY = "Query";
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	3220 static const char* const KEY_REQUESTED_TAGS = "RequestedTags";
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3221 static const char* const KEY_SINCE = "Since";
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3222 static const char* const KEY_LABELS = "Labels"; // New in Orthanc 1.12.0
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3223 static const char* const KEY_LABELS_CONSTRAINT = "LabelsConstraint"; // New in Orthanc 1.12.0
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3224
4421 a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3225 if (call.IsDocumentation())
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3226 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3227 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Human);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3228
4421 a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3229 call.GetDocumentation()
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3230 .SetTag("System")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3231 .SetSummary("Look for local resources")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3232 .SetDescription("This URI can be used to perform a search on the content of the local Orthanc server, "
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3233 "in a way that is similar to querying remote DICOM modalities using C-FIND SCU: "
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	3234 "https://orthanc.uclouvain.be/book/users/rest.html#performing-finds-within-orthanc")
4421 a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3235 .SetRequestField(KEY_CASE_SENSITIVE, RestApiCallDocumentation::Type_Boolean,
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3236 "Enable case-sensitive search for PN value representations (defaults to configuration option `CaseSensitivePN`)", false)
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3237 .SetRequestField(KEY_EXPAND, RestApiCallDocumentation::Type_Boolean,
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3238 "Also retrieve the content of the matching resources, not only their Orthanc identifiers", false)
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3239 .SetRequestField(KEY_LEVEL, RestApiCallDocumentation::Type_String,
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3240 "Level of the query (`Patient`, `Study`, `Series` or `Instance`)", true)
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3241 .SetRequestField(KEY_LIMIT, RestApiCallDocumentation::Type_Number,
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3242 "Limit the number of reported resources", false)
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3243 .SetRequestField(KEY_SINCE, RestApiCallDocumentation::Type_Number,
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3244 "Show only the resources since the provided index (in conjunction with `Limit`)", false)
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	3245 .SetRequestField(KEY_REQUESTED_TAGS, RestApiCallDocumentation::Type_JsonListOfStrings,
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	3246 "A list of DICOM tags to include in the response (applicable only if \"Expand\" is set to true). "
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	3247 "The tags requested tags are returned in the 'RequestedTags' field in the response. "
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	3248 "Note that, if you are requesting tags that are not listed in the Main Dicom Tags stored in DB, building the response "
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	3249 "might be slow since Orthanc will need to access the DICOM files. If not specified, Orthanc will return "
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4902 diff changeset	3250 "all Main Dicom Tags to keep backward compatibility with Orthanc prior to 1.11.0.", false)
4421 a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3251 .SetRequestField(KEY_QUERY, RestApiCallDocumentation::Type_JsonObject,
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3252 "Associative array containing the filter on the values of the DICOM tags", true)
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3253 .SetRequestField(KEY_LABELS, RestApiCallDocumentation::Type_JsonListOfStrings,
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3254 "List of strings specifying which labels to look for in the resources (new in Orthanc 1.12.0)", true)
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3255 .SetRequestField(KEY_LABELS_CONSTRAINT, RestApiCallDocumentation::Type_String,
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3256 "Constraint on the labels, can be `All`, `Any`, or `None` (defaults to `All`, new in Orthanc 1.12.0)", true)
4421 a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3257 .AddAnswerType(MimeType_Json, "JSON array containing either the Orthanc identifiers, or detailed information "
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3258 "about the reported resources (if `Expand` argument is `true`)");
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3259 return;
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3260 }
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3261
1358 62d2d35b725e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1356 diff changeset	3262 ServerContext& context = OrthancRestApi::GetContext(call);
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3263
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3264 Json::Value request;
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3265 if (!call.ParseJsonRequest(request) \|\|
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3266 request.type() != Json::objectValue)
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3267 {
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3268 throw OrthancException(ErrorCode_BadRequest,
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3269 "The body must contain a JSON object");
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3270 }
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3271 else if (!request.isMember(KEY_LEVEL) \|\|
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3272 request[KEY_LEVEL].type() != Json::stringValue)
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3273 {
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3274 throw OrthancException(ErrorCode_BadRequest,
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3275 "Field \"" + std::string(KEY_LEVEL) + "\" is missing, or should be a string");
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3276 }
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3277 else if (!request.isMember(KEY_QUERY) &&
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3278 request[KEY_QUERY].type() != Json::objectValue)
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3279 {
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3280 throw OrthancException(ErrorCode_BadRequest,
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3281 "Field \"" + std::string(KEY_QUERY) + "\" is missing, or should be a JSON object");
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3282 }
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3283 else if (request.isMember(KEY_CASE_SENSITIVE) &&
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3284 request[KEY_CASE_SENSITIVE].type() != Json::booleanValue)
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3285 {
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3286 throw OrthancException(ErrorCode_BadRequest,
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3287 "Field \"" + std::string(KEY_CASE_SENSITIVE) + "\" must be a Boolean");
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3288 }
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3289 else if (request.isMember(KEY_LIMIT) &&
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3290 request[KEY_LIMIT].type() != Json::intValue)
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3291 {
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3292 throw OrthancException(ErrorCode_BadRequest,
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3293 "Field \"" + std::string(KEY_LIMIT) + "\" must be an integer");
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3294 }
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3295 else if (request.isMember(KEY_SINCE) &&
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3296 request[KEY_SINCE].type() != Json::intValue)
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3297 {
7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3298 throw OrthancException(ErrorCode_BadRequest,
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3299 "Field \"" + std::string(KEY_SINCE) + "\" must be an integer");
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3300 }
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3301 else if (request.isMember(KEY_REQUESTED_TAGS) &&
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3302 request[KEY_REQUESTED_TAGS].type() != Json::arrayValue)
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3303 {
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3304 throw OrthancException(ErrorCode_BadRequest,
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3305 "Field \"" + std::string(KEY_REQUESTED_TAGS) + "\" must be an array");
988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3306 }
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3307 else if (request.isMember(KEY_LABELS) &&
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3308 request[KEY_LABELS].type() != Json::arrayValue)
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3309 {
988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3310 throw OrthancException(ErrorCode_BadRequest,
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3311 "Field \"" + std::string(KEY_LABELS) + "\" must be an array of strings");
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3312 }
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3313 else if (request.isMember(KEY_LABELS_CONSTRAINT) &&
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3314 request[KEY_LABELS_CONSTRAINT].type() != Json::stringValue)
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3315 {
988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3316 throw OrthancException(ErrorCode_BadRequest,
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3317 "Field \"" + std::string(KEY_LABELS_CONSTRAINT) + "\" must be an array of strings");
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3318 }
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3319 else
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3320 {
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3321 bool expand = false;
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3322 if (request.isMember(KEY_EXPAND))
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3323 {
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3324 expand = request[KEY_EXPAND].asBool();
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3325 }
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3326
1374 a1745d9be6e9 CaseSensitivePN configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1361 diff changeset	3327 bool caseSensitive = false;
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3328 if (request.isMember(KEY_CASE_SENSITIVE))
1374 a1745d9be6e9 CaseSensitivePN configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1361 diff changeset	3329 {
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3330 caseSensitive = request[KEY_CASE_SENSITIVE].asBool();
1374 a1745d9be6e9 CaseSensitivePN configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1361 diff changeset	3331 }
a1745d9be6e9 CaseSensitivePN configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1361 diff changeset	3332
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1728 diff changeset	3333 size_t limit = 0;
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3334 if (request.isMember(KEY_LIMIT))
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1728 diff changeset	3335 {
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3336 int tmp = request[KEY_LIMIT].asInt();
1847 559956d5ceb2 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	3337 if (tmp < 0)
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1728 diff changeset	3338 {
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3339 throw OrthancException(ErrorCode_ParameterOutOfRange,
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3340 "Field \"" + std::string(KEY_LIMIT) + "\" must be a positive integer");
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1728 diff changeset	3341 }
1847 559956d5ceb2 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	3342
559956d5ceb2 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1831 diff changeset	3343 limit = static_cast<size_t>(tmp);
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1728 diff changeset	3344 }
318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1728 diff changeset	3345
2304 563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	3346 size_t since = 0;
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3347 if (request.isMember(KEY_SINCE))
2304 563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	3348 {
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3349 int tmp = request[KEY_SINCE].asInt();
2304 563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	3350 if (tmp < 0)
563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	3351 {
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3352 throw OrthancException(ErrorCode_ParameterOutOfRange,
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3353 "Field \"" + std::string(KEY_SINCE) + "\" must be a positive integer");
2304 563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	3354 }
563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	3355
563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	3356 since = static_cast<size_t>(tmp);
563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	3357 }
563bf878407a Argument "Since" in URI "/tools/find" (related to issue 53) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2281 diff changeset	3358
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3359 std::set<DicomTag> requestedTags;
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3360
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3361 if (request.isMember(KEY_REQUESTED_TAGS))
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3362 {
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3363 FromDcmtkBridge::ParseListOfTags(requestedTags, request[KEY_REQUESTED_TAGS]);
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3364 }
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3365
3033 5da6d1063d8f effectively replacing LookupResource by DatabaseLookup in searches Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	3366 ResourceType level = StringToResourceType(request[KEY_LEVEL].asCString());
1360 0649c5aef34a DicomFindQuery Sebastien Jodogne <s.jodogne@gmail.com> parents: 1358 diff changeset	3367
3033 5da6d1063d8f effectively replacing LookupResource by DatabaseLookup in searches Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	3368 DatabaseLookup query;
1358 62d2d35b725e cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1356 diff changeset	3369
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3370 Json::Value::Members members = request[KEY_QUERY].getMemberNames();
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3371 for (size_t i = 0; i < members.size(); i++)
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3372 {
2998 0a52af0c66e7 sharing strings Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	3373 if (request[KEY_QUERY][members[i]].type() != Json::stringValue)
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3374 {
3001 7695a9c81099 refactoring /tools/find using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 2998 diff changeset	3375 throw OrthancException(ErrorCode_BadRequest,
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3376 "Tag \"" + members[i] + "\" must be associated with a string");
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3377 }
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3378
3163 cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	3379 const std::string value = request[KEY_QUERY][members[i]].asString();
cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	3380
cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	3381 if (!value.empty())
cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	3382 {
cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	3383 // An empty string corresponds to an universal constraint,
cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	3384 // so we ignore it. This mimics the behavior of class
cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	3385 // "OrthancFindRequestHandler"
cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	3386 query.AddRestConstraint(FromDcmtkBridge::ParseTag(members[i]),
cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	3387 value, caseSensitive, true);
cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	3388 }
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1360 diff changeset	3389 }
2876 ae8e72009e64 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 2836 diff changeset	3390
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3391 if (request.isMember(KEY_LABELS)) // New in Orthanc 1.12.0
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3392 {
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3393 for (Json::Value::ArrayIndex i = 0; i < request[KEY_LABELS].size(); i++)
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3394 {
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3395 if (request[KEY_LABELS][i].type() != Json::stringValue)
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3396 {
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3397 throw OrthancException(ErrorCode_BadRequest, "Field \"" + std::string(KEY_LABELS) + "\" must contain strings");
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3398 }
988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3399 else
988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3400 {
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3401 query.AddLabel(request[KEY_LABELS][i].asString());
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3402 }
988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3403 }
988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3404 }
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3405
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3406 query.SetLabelsConstraint(LabelsConstraint_All);
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3407
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3408 if (request.isMember(KEY_LABELS_CONSTRAINT))
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3409 {
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3410 const std::string& s = request[KEY_LABELS_CONSTRAINT].asString();
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3411 if (s == "All")
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3412 {
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3413 query.SetLabelsConstraint(LabelsConstraint_All);
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3414 }
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3415 else if (s == "Any")
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3416 {
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3417 query.SetLabelsConstraint(LabelsConstraint_Any);
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3418 }
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3419 else if (s == "None")
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3420 {
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3421 query.SetLabelsConstraint(LabelsConstraint_None);
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3422 }
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3423 else
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3424 {
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	3425 throw OrthancException(ErrorCode_BadRequest, "Field \"" + std::string(KEY_LABELS_CONSTRAINT) + "\" must be \"All\", \"Any\", or \"None\"");
5227 988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3426 }
988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3427 }
988dab8deb1c "/tools/find" accepts the "WithLabels" and "WithoutLabels" arguments Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	3428
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	3429 FindVisitor visitor(OrthancRestApi::GetDicomFormat(request, DicomToJsonFormat_Human), context.GetFindStorageAccessMode());
3033 5da6d1063d8f effectively replacing LookupResource by DatabaseLookup in searches Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	3430 context.Apply(visitor, query, level, since, limit);
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3431 visitor.Answer(call.GetOutput(), context, level, expand, requestedTags);
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3432 }
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3433 }
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3434
3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	3435
1140 94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3436 template <enum ResourceType start,
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3437 enum ResourceType end>
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3438 static void GetChildResources(RestApiGetCall& call)
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3439 {
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3440 if (call.IsDocumentation())
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3441 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3442 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Human);
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3443 OrthancRestApi::DocumentRequestedTags(call);
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3444
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3445 const std::string children = GetResourceTypeText(end, true /* plural /, false / lower case */);
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3446 const std::string resource = GetResourceTypeText(start, false /* plural /, false / lower case */);
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3447 call.GetDocumentation()
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3448 .SetTag(GetResourceTypeText(start, true /* plural /, true / upper case */))
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3449 .SetSummary("Get child " + children)
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3450 .SetDescription("Get detailed information about the child " + children + " of the DICOM " +
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3451 resource + " whose Orthanc identifier is provided in the URL")
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3452 .SetUriArgument("id", "Orthanc identifier of the " + resource + " of interest")
5405 62bb63346185 All 'expand' GET arguments now accepts expand=true and expand=false values + /studies/../instances now supports expand=false Alain Mazy <am@osimis.io> parents: 5393 diff changeset	3453 .SetHttpGetArgument("expand", RestApiCallDocumentation::Type_String,
62bb63346185 All 'expand' GET arguments now accepts expand=true and expand=false values + /studies/../instances now supports expand=false Alain Mazy <am@osimis.io> parents: 5393 diff changeset	3454 "If false or missing, only retrieve the list of child " + children, false)
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3455 .AddAnswerType(MimeType_Json, "JSON array containing information about the child DICOM " + children)
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3456 .SetTruncatedJsonHttpGetSample(GetDocumentationSampleResource(start) + "/" + children, 5);
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3457 return;
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3458 }
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3459
1140 94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3460 ServerIndex& index = OrthancRestApi::GetIndex(call);
5405 62bb63346185 All 'expand' GET arguments now accepts expand=true and expand=false values + /studies/../instances now supports expand=false Alain Mazy <am@osimis.io> parents: 5393 diff changeset	3461 ServerContext& context = OrthancRestApi::GetContext(call);
1140 94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3462
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3463 std::set<DicomTag> requestedTags;
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3464 OrthancRestApi::GetRequestedTags(requestedTags, call);
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3465
1140 94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3466 std::list<std::string> a, b, c;
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3467 a.push_back(call.GetUriComponent("id", ""));
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3468
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3469 ResourceType type = start;
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3470 while (type != end)
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3471 {
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3472 b.clear();
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3473
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3474 for (std::list<std::string>::const_iterator
1303 bba8a47922d1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	3475 it = a.begin(); it != a.end(); ++it)
1140 94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3476 {
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3477 index.GetChildren(c, *it);
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3478 b.splice(b.begin(), c);
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3479 }
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3480
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	3481 type = GetChildResourceType(type);
1140 94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3482
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3483 a.clear();
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3484 a.splice(a.begin(), b);
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3485 }
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3486
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5485 diff changeset	3487 AnswerListOfResources2(call.GetOutput(), context, a, type, !call.HasArgument("expand") \|\| call.GetBooleanArgument("expand", false), // this "expand" is the only one to have a false default value to keep backward compatibility
5405 62bb63346185 All 'expand' GET arguments now accepts expand=true and expand=false values + /studies/../instances now supports expand=false Alain Mazy <am@osimis.io> parents: 5393 diff changeset	3488 OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Human),
62bb63346185 All 'expand' GET arguments now accepts expand=true and expand=false values + /studies/../instances now supports expand=false Alain Mazy <am@osimis.io> parents: 5393 diff changeset	3489 requestedTags,
62bb63346185 All 'expand' GET arguments now accepts expand=true and expand=false values + /studies/../instances now supports expand=false Alain Mazy <am@osimis.io> parents: 5393 diff changeset	3490 true /* allowStorageAccess */);
1140 94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3491 }
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3492
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3493
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3494 static void GetChildInstancesTags(RestApiGetCall& call)
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3495 {
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3496 if (call.IsDocumentation())
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3497 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3498 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Full);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3499
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3500 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3501 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3502 call.GetDocumentation()
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3503 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3504 .SetSummary("Get tags of instances")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3505 .SetDescription("Get the tags of all the child instances of the DICOM " + r +
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3506 " whose Orthanc identifier is provided in the URL")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3507 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
4722 2b4da0ee6b73 added missing documentation of "ignore-length" in "/instances/{id}/tags" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4716 diff changeset	3508 .SetHttpGetArgument(IGNORE_LENGTH, RestApiCallDocumentation::Type_JsonListOfStrings,
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3509 "Also include the DICOM tags that are provided in this list, even if their associated value is long", false)
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3510 .AddAnswerType(MimeType_Json, "JSON object associating the Orthanc identifiers of the instances, with the values of their DICOM tags")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3511 .SetTruncatedJsonHttpGetSample(GetDocumentationSampleResource(t) + "/instances-tags", 5);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3512 return;
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3513 }
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3514
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3515 ServerContext& context = OrthancRestApi::GetContext(call);
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3516 std::string publicId = call.GetUriComponent("id", "");
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3517 DicomToJsonFormat format = OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Full);
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3518
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	3519 std::set<DicomTag> ignoreTagLength;
4722 2b4da0ee6b73 added missing documentation of "ignore-length" in "/instances/{id}/tags" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4716 diff changeset	3520 ParseSetOfTags(ignoreTagLength, call, IGNORE_LENGTH);
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	3521
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3522 // Retrieve all the instances of this patient/study/series
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3523 typedef std::list<std::string> Instances;
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3524 Instances instances;
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3525
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3526 context.GetIndex().GetChildInstances(instances, publicId); // (*)
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3527
1201 09aa7c126be9 URIs 'instance-tags' now indexed by the instance IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1172 diff changeset	3528 Json::Value result = Json::objectValue;
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3529
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3530 for (Instances::const_iterator it = instances.begin();
1303 bba8a47922d1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	3531 it != instances.end(); ++it)
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3532 {
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3533 Json::Value full;
2409 e4045b3c9772 ignore-length argument if retrieving DICOM tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 2408 diff changeset	3534 context.ReadDicomAsJson(full, *it, ignoreTagLength);
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3535
2622 3603a2e14592 New option "?short" to list DICOM tags using their hexadecimal ID Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	3536 if (format != DicomToJsonFormat_Full)
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3537 {
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3538 Json::Value simplified;
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	3539 Toolbox::SimplifyDicomAsJson(simplified, full, format);
1201 09aa7c126be9 URIs 'instance-tags' now indexed by the instance IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1172 diff changeset	3540 result[*it] = simplified;
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3541 }
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3542 else
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3543 {
1201 09aa7c126be9 URIs 'instance-tags' now indexed by the instance IDs Sebastien Jodogne <s.jodogne@gmail.com> parents: 1172 diff changeset	3544 result[*it] = full;
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3545 }
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3546 }
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3547
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3548 call.GetOutput().AnswerJson(result);
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3549 }
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3550
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	3551
1140 94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	3552
1281 8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3553 template <enum ResourceType start,
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3554 enum ResourceType end>
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3555 static void GetParentResource(RestApiGetCall& call)
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3556 {
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3557 assert(start > end);
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3558
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3559 if (call.IsDocumentation())
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3560 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3561 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Human);
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3562 OrthancRestApi::DocumentRequestedTags(call);
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3563
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3564 const std::string parent = GetResourceTypeText(end, false /* plural /, false / lower case */);
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3565 const std::string resource = GetResourceTypeText(start, false /* plural /, false / lower case */);
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3566 call.GetDocumentation()
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3567 .SetTag(GetResourceTypeText(start, true /* plural /, true / upper case */))
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3568 .SetSummary("Get parent " + parent)
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3569 .SetDescription("Get detailed information about the parent " + parent + " of the DICOM " +
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4415 diff changeset	3570 resource + " whose Orthanc identifier is provided in the URL")
4415 b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3571 .SetUriArgument("id", "Orthanc identifier of the " + resource + " of interest")
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3572 .AddAnswerType(MimeType_Json, "Information about the parent DICOM " + parent)
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3573 .SetTruncatedJsonHttpGetSample(GetDocumentationSampleResource(start) + "/" + parent, 10);
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3574 return;
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3575 }
b50410d0e98c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4414 diff changeset	3576
1281 8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3577 ServerIndex& index = OrthancRestApi::GetIndex(call);
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3578
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3579 std::set<DicomTag> requestedTags;
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3580 OrthancRestApi::GetRequestedTags(requestedTags, call);
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3581
1281 8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3582 std::string current = call.GetUriComponent("id", "");
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3583 ResourceType currentType = start;
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3584 while (currentType > end)
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3585 {
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3586 std::string parent;
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3587 if (!index.LookupParent(parent, current))
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3588 {
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3589 // Error that could happen if the resource gets deleted by
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3590 // another concurrent call
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3591 return;
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3592 }
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3593
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3594 current = parent;
1555 d6a93e12b1c1 Creation of DICOM files with encapsulated PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	3595 currentType = GetParentResourceType(currentType);
1281 8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3596 }
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3597
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3598 assert(currentType == end);
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3599
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3600 const DicomToJsonFormat format = OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Human);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3601
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	3602 Json::Value resource;
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	3603 if (OrthancRestApi::GetContext(call).ExpandResource(resource, current, end, format, requestedTags, true /* allowStorageAccess */))
1281 8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3604 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	3605 call.GetOutput().AnswerJson(resource);
1281 8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3606 }
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3607 }
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3608
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3609
1556 b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3610 static void ExtractPdf(RestApiGetCall& call)
b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3611 {
4407 2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3612 if (call.IsDocumentation())
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3613 {
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3614 call.GetDocumentation()
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3615 .SetTag("Instances")
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3616 .SetSummary("Get embedded PDF")
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3617 .SetDescription("Get the PDF file that is embedded in one DICOM instance. "
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3618 "If the DICOM instance doesn't contain the `EncapsulatedDocument` tag or if the "
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3619 "`MIMETypeOfEncapsulatedDocument` tag doesn't correspond to the PDF type, a `404` HTTP error is raised.")
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3620 .SetUriArgument("id", "Orthanc identifier of the instance interest")
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3621 .AddAnswerType(MimeType_Pdf, "PDF file");
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3622 return;
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3623 }
2412601cd24b cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4406 diff changeset	3624
1556 b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3625 const std::string id = call.GetUriComponent("id", "");
b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3626 std::string pdf;
b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3627 ServerContext::DicomCacheLocker locker(OrthancRestApi::GetContext(call), id);
b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3628
b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3629 if (locker.GetDicom().ExtractPdf(pdf))
b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3630 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	3631 call.GetOutput().AnswerBuffer(pdf, MimeType_Pdf);
1556 b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3632 return;
b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3633 }
b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3634 }
b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	3635
1281 8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	3636
1702 9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	3637 static void OrderSlices(RestApiGetCall& call)
9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	3638 {
4421 a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3639 if (call.IsDocumentation())
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3640 {
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3641 call.GetDocumentation()
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3642 .SetDeprecated()
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3643 .SetTag("Series")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3644 .SetSummary("Order the slices")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3645 .SetDescription("Sort the instances and frames (slices) of the DICOM series whose Orthanc identifier is provided in the URL. "
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3646 "This URI is essentially used by the Orthanc Web viewer and by the Osimis Web viewer.")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3647 .SetUriArgument("id", "Orthanc identifier of the series of interest")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3648 .SetAnswerField("Dicom", RestApiCallDocumentation::Type_JsonListOfStrings,
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3649 "Ordered list of paths to DICOM instances")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3650 .SetAnswerField("Slices", RestApiCallDocumentation::Type_JsonListOfStrings,
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3651 "Ordered list of paths to frames. It is recommended to use this field, as it is also valid "
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3652 "in the case of multiframe images.")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3653 .SetAnswerField("SlicesShort", RestApiCallDocumentation::Type_JsonListOfObjects,
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3654 "Same information as the `Slices` field, but in a compact form")
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3655 .SetAnswerField("Type", RestApiCallDocumentation::Type_String,
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3656 "Can be `Volume` (for 3D volumes) or `Sequence` (notably for cine images)")
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	3657 .SetTruncatedJsonHttpGetSample("https://orthanc.uclouvain.be/demo/series/1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0/ordered-slices", 10);
4421 a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3658 return;
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3659 }
a7d72378e1cb cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4420 diff changeset	3660
1702 9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	3661 const std::string id = call.GetUriComponent("id", "");
9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	3662
9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	3663 ServerIndex& index = OrthancRestApi::GetIndex(call);
9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	3664 SliceOrdering ordering(index, id);
9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	3665
1703 b80e76dd1d56 ordered-slices continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 1702 diff changeset	3666 Json::Value result;
b80e76dd1d56 ordered-slices continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 1702 diff changeset	3667 ordering.Format(result);
b80e76dd1d56 ordered-slices continued Sebastien Jodogne <s.jodogne@gmail.com> parents: 1702 diff changeset	3668 call.GetOutput().AnswerJson(result);
1702 9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	3669 }
9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	3670
9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	3671
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3672 static void GetInstanceHeader(RestApiGetCall& call)
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3673 {
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3674 if (call.IsDocumentation())
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3675 {
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3676 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Full);
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3677 call.GetDocumentation()
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3678 .SetTag("Instances")
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3679 .SetSummary("Get DICOM meta-header")
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3680 .SetDescription("Get the DICOM tags in the meta-header of the DICOM instance. By default, the `full` format is used, which "
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3681 "combines hexadecimal tags with human-readable description.")
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3682 .SetUriArgument("id", "Orthanc identifier of the DICOM instance of interest")
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3683 .AddAnswerType(MimeType_Json, "JSON object containing the DICOM tags and their associated value")
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	3684 .SetHttpGetSample("https://orthanc.uclouvain.be/demo/instances/7c92ce8e-bbf67ed2-ffa3b8c1-a3b35d94-7ff3ae26/header", true);
4404 f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3685 return;
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3686 }
f34634916d8c cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4403 diff changeset	3687
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3688 ServerContext& context = OrthancRestApi::GetContext(call);
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3689
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3690 std::string publicId = call.GetUriComponent("id", "");
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3691
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3692 std::string dicomContent;
4792 434843934307 Added a StorageCache in the StorageAccessor Alain Mazy <am@osimis.io> parents: 4777 diff changeset	3693 context.ReadDicomForHeader(dicomContent, publicId);
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3694
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2003 diff changeset	3695 // TODO Consider using "DicomMap::ParseDicomMetaInformation()" to
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2003 diff changeset	3696 // speed up things here
655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2003 diff changeset	3697
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3698 ParsedDicomFile dicom(dicomContent);
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3699
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3700 Json::Value header;
4140 0ddc5297a8ab centralization of default parameters for JSON/DicomMap conversions from DCMTK Sebastien Jodogne <s.jodogne@gmail.com> parents: 4139 diff changeset	3701 OrthancConfiguration::DefaultDicomHeaderToJson(header, dicom);
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3702
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	3703 AnswerDicomAsJson(call, header, OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Full));
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3704 }
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3705
3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	3706
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3707 static void InvalidateTags(RestApiPostCall& call)
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3708 {
4420 f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3709 if (call.IsDocumentation())
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3710 {
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3711 call.GetDocumentation()
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3712 .SetTag("System")
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3713 .SetSummary("Invalidate DICOM-as-JSON summaries")
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3714 .SetDescription("Remove all the attachments of the type \"DICOM-as-JSON\" that are associated will all the "
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3715 "DICOM instances stored in Orthanc. These summaries will be automatically re-created on the next access. "
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3716 "This is notably useful after changes to the `Dictionary` configuration option. "
5432 59e3b6f8c5be migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 5427 diff changeset	3717 "https://orthanc.uclouvain.be/book/faq/orthanc-storage.html#storage-area");
4420 f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3718 return;
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3719 }
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3720
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3721 ServerIndex& index = OrthancRestApi::GetIndex(call);
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3722
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3723 // Loop over the instances, grouping them by parent studies so as
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3724 // to avoid large memory consumption
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3725 std::list<std::string> studies;
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3726 index.GetAllUuids(studies, ResourceType_Study);
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3727
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3728 for (std::list<std::string>::const_iterator
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3729 study = studies.begin(); study != studies.end(); ++study)
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3730 {
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3731 std::list<std::string> instances;
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3732 index.GetChildInstances(instances, *study);
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3733
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3734 for (std::list<std::string>::const_iterator
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3735 instance = instances.begin(); instance != instances.end(); ++instance)
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3736 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	3737 index.DeleteAttachment(*instance, FileContentType_DicomAsJson,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	3738 false /* no revision checks /, -1 / dummy /, "" / dummy */);
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3739 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3740 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3741
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	3742 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3743 }
0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3744
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3745 void DocumentReconstructFilesField(RestApiPostCall& call, bool documentLimitField)
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3746 {
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3747 call.GetDocumentation()
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3748 .SetRequestField(RECONSTRUCT_FILES, RestApiCallDocumentation::Type_Boolean,
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3749 "Also reconstruct the files of the resources (e.g: apply IngestTranscoding, StorageCompression). "
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3750 "'false' by default. (New in Orthanc 1.11.0)", false);
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3751 if (documentLimitField)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3752 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3753 call.GetDocumentation()
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3754 .SetRequestField(LIMIT_TO_THIS_LEVEL_MAIN_DICOM_TAGS, RestApiCallDocumentation::Type_Boolean,
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3755 "Only reconstruct this level MainDicomTags by re-reading them from a random child instance of the resource. "
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3756 "This option is much faster than a full reconstruct and is usefull e.g. if you have modified the "
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3757 "'ExtraMainDicomTags' at the Study level to optimize the speed of some C-Find. "
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3758 "'false' by default. (New in Orthanc 1.12.4)", false);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3759 }
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3760 }
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3761
4994 2f30aa99c2db cppcheck Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3762 bool GetReconstructFilesField(const RestApiPostCall& call)
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3763 {
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3764 bool reconstructFiles = false;
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3765 Json::Value request;
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3766
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3767 if (call.GetBodySize() > 0 && call.ParseJsonRequest(request) && request.isMember(RECONSTRUCT_FILES)) // allow "" payload to keep backward compatibility
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3768 {
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3769 if (!request[RECONSTRUCT_FILES].isBool())
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3770 {
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3771 throw OrthancException(ErrorCode_BadFileFormat,
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3772 "The field " + std::string(RECONSTRUCT_FILES) + " must contain a Boolean");
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3773 }
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3774
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3775 reconstructFiles = request[RECONSTRUCT_FILES].asBool();
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3776 }
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3777
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3778 return reconstructFiles;
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3779 }
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	3780
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3781 bool GetLimitToThisLevelMainDicomTags(const RestApiPostCall& call)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3782 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3783 bool limitToThisLevel = false;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3784 Json::Value request;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3785
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3786 if (call.GetBodySize() > 0 && call.ParseJsonRequest(request) && request.isMember(LIMIT_TO_THIS_LEVEL_MAIN_DICOM_TAGS))
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3787 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3788 if (!request[LIMIT_TO_THIS_LEVEL_MAIN_DICOM_TAGS].isBool())
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3789 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3790 throw OrthancException(ErrorCode_BadFileFormat,
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3791 "The field " + std::string(LIMIT_TO_THIS_LEVEL_MAIN_DICOM_TAGS) + " must contain a Boolean");
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3792 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3793
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3794 limitToThisLevel = request[LIMIT_TO_THIS_LEVEL_MAIN_DICOM_TAGS].asBool();
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3795 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3796
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3797 return limitToThisLevel;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3798 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3799
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3800
2209 e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	3801 template <enum ResourceType type>
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	3802 static void ReconstructResource(RestApiPostCall& call)
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	3803 {
4420 f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3804 if (call.IsDocumentation())
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3805 {
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3806 const std::string resource = GetResourceTypeText(type, false /* plural /, false / lower case */);
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3807 call.GetDocumentation()
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3808 .SetTag(GetResourceTypeText(type, true /* plural /, true / upper case */))
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3809 .SetSummary("Reconstruct tags & optionally files of " + resource)
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3810 .SetDescription("Reconstruct the main DICOM tags in DB of the " + resource + " whose Orthanc identifier is provided "
4420 f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3811 "in the URL. This is useful if child studies/series/instances have inconsistent values for "
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3812 "higher-level tags, in order to force Orthanc to use the value from the resource of interest. "
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3813 "Beware that this is a time-consuming operation, as all the children DICOM instances will be "
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3814 "parsed again, and the Orthanc index will be updated accordingly.")
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3815 .SetUriArgument("id", "Orthanc identifier of the " + resource + " of interest");
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3816 DocumentReconstructFilesField(call, true);
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3817
4420 f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3818 return;
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3819 }
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3820
2209 e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	3821 ServerContext& context = OrthancRestApi::GetContext(call);
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3822 ServerToolbox::ReconstructResource(context, call.GetUriComponent("id", ""), GetReconstructFilesField(call), GetLimitToThisLevelMainDicomTags(call), type);
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	3823 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
2209 e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	3824 }
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	3825
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	3826
2804 d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3827 static void ReconstructAllResources(RestApiPostCall& call)
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3828 {
4420 f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3829 if (call.IsDocumentation())
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3830 {
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3831 call.GetDocumentation()
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3832 .SetTag("System")
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3833 .SetSummary("Reconstruct all the index")
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3834 .SetDescription("Reconstruct the index of all the tags of all the DICOM instances that are stored in Orthanc. "
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3835 "This is notably useful after the deletion of resources whose children resources have inconsistent "
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3836 "values with their sibling resources. Beware that this is a highly time-consuming operation, "
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3837 "as all the DICOM instances will be parsed again, and as all the Orthanc index will be regenerated. "
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3838 "If you have a large database to process, it is advised to use the Housekeeper plugin to perform "
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3839 "this action resource by resource");
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3840 DocumentReconstructFilesField(call, false);
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3841
4420 f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3842 return;
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3843 }
f95ad769e671 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4419 diff changeset	3844
2804 d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3845 ServerContext& context = OrthancRestApi::GetContext(call);
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3846
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3847 std::list<std::string> studies;
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3848 context.GetIndex().GetAllUuids(studies, ResourceType_Study);
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4977 diff changeset	3849 bool reconstructFiles = GetReconstructFilesField(call);
2804 d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3850
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3851 for (std::list<std::string>::const_iterator
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3852 study = studies.begin(); study != studies.end(); ++study)
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3853 {
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5485 diff changeset	3854 ServerToolbox::ReconstructResource(context, study, reconstructFiles, false, ResourceType_Study / dummy */);
2804 d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3855 }
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3856
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	3857 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
2804 d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3858 }
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3859
d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	3860
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3861 static void GetBulkChildren(std::set<std::string>& target,
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3862 ServerIndex& index,
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3863 const std::set<std::string>& source)
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3864 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3865 target.clear();
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3866
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3867 for (std::set<std::string>::const_iterator
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3868 it = source.begin(); it != source.end(); ++it)
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3869 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3870 std::list<std::string> children;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3871 index.GetChildren(children, *it);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3872
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3873 for (std::list<std::string>::const_iterator
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3874 child = children.begin(); child != children.end(); ++child)
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3875 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3876 target.insert(*child);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3877 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3878 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3879 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3880
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3881
4714 8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3882 static void AddMetadata(Json::Value& target,
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3883 ServerIndex& index,
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3884 const std::string& resource,
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3885 ResourceType level)
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3886 {
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3887 target = Json::objectValue;
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3888
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3889 std::map<MetadataType, std::string> content;
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3890 index.GetAllMetadata(content, resource, level);
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3891
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3892 for (std::map<MetadataType, std::string>::const_iterator
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3893 it = content.begin(); it != content.end(); ++it)
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3894 {
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3895 target[EnumerationToString(it->first)] = it->second;
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3896 }
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3897 }
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3898
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3899
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3900 static void BulkContent(RestApiPostCall& call)
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3901 {
4714 8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3902 static const char* const LEVEL = "Level";
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3903 static const char* const METADATA = "Metadata";
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3904
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3905 if (call.IsDocumentation())
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3906 {
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3907 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Human);
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3908
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3909 call.GetDocumentation()
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3910 .SetTag("System")
4879 c728d8f25e5a fix doc Alain Mazy <am@osimis.io> parents: 4858 diff changeset	3911 .SetSummary("Describe a set of resources")
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3912 .SetRequestField("Resources", RestApiCallDocumentation::Type_JsonListOfStrings,
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3913 "List of the Orthanc identifiers of the patients/studies/series/instances of interest.", true)
4714 8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3914 .SetRequestField(LEVEL, RestApiCallDocumentation::Type_String,
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3915 "This optional argument specifies the level of interest (can be `Patient`, `Study`, `Series` or "
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	3916 "`Instance`). Orthanc will loop over the items inside `Resources`, and explore upward or "
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3917 "downward in the DICOM hierarchy in order to find the level of interest.", false)
4714 8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3918 .SetRequestField(METADATA, RestApiCallDocumentation::Type_Boolean,
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3919 "If set to `true` (default value), the metadata associated with the resources will also be retrieved.", false)
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3920 .SetDescription("Get the content all the DICOM patients, studies, series or instances "
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3921 "whose identifiers are provided in the `Resources` field, in one single call.");
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3922 return;
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3923 }
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3924
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3925 Json::Value request;
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3926 if (!call.ParseJsonRequest(request) \|\|
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3927 request.type() != Json::objectValue)
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3928 {
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3929 throw OrthancException(ErrorCode_BadRequest,
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3930 "The body must contain a JSON object");
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3931 }
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3932 else
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3933 {
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3934 const DicomToJsonFormat format = OrthancRestApi::GetDicomFormat(request, DicomToJsonFormat_Human);
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3935
4714 8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3936 bool metadata = true;
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3937 if (request.isMember(METADATA))
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3938 {
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3939 metadata = SerializationToolbox::ReadBoolean(request, METADATA);
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3940 }
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	3941
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3942 ServerIndex& index = OrthancRestApi::GetIndex(call);
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3943
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3944 Json::Value answer = Json::arrayValue;
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3945
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3946 if (request.isMember(LEVEL))
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3947 {
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3948 // Complex case: Need to explore the DICOM hierarchy
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3949 ResourceType level = StringToResourceType(SerializationToolbox::ReadString(request, LEVEL).c_str());
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3950
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3951 std::set<std::string> resources;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3952 SerializationToolbox::ReadSetOfStrings(resources, request, "Resources");
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3953
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3954 std::set<std::string> interest;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3955
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3956 assert(ResourceType_Patient < ResourceType_Study &&
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3957 ResourceType_Study < ResourceType_Series &&
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3958 ResourceType_Series < ResourceType_Instance);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3959
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3960 for (std::set<std::string>::const_iterator
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3961 it = resources.begin(); it != resources.end(); ++it)
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	3962 {
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3963 ResourceType type;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3964 if (index.LookupResourceType(type, *it))
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3965 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3966 if (type == level)
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3967 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3968 // This resource is already from the level of interest
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3969 interest.insert(*it);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3970 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3971 else if (type < level)
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3972 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3973 // Need to explore children
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3974 std::set<std::string> current;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3975 current.insert(*it);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3976
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3977 for (;;)
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3978 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3979 std::set<std::string> children;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3980 GetBulkChildren(children, index, current);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3981
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3982 type = GetChildResourceType(type);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3983 if (type == level)
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3984 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3985 for (std::set<std::string>::const_iterator
4716 758fe3ffb336 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4714 diff changeset	3986 it2 = children.begin(); it2 != children.end(); ++it2)
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3987 {
4716 758fe3ffb336 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4714 diff changeset	3988 interest.insert(*it2);
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3989 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3990
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3991 break; // done
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3992 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3993 else
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3994 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3995 current.swap(children);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3996 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3997 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3998 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	3999 else
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4000 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4001 // Need to explore parents
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4002 std::string current = *it;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4003
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4004 for (;;)
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4005 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4006 std::string parent;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4007 if (index.LookupParent(parent, current))
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4008 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4009 type = GetParentResourceType(type);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4010 if (type == level)
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4011 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4012 interest.insert(parent);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4013 break; // done
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4014 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4015 else
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4016 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4017 current = parent;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4018 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4019 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4020 else
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4021 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4022 break; // The resource has been deleted during the exploration
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4023 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4024 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4025 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4026 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4027 else
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4028 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4029 CLOG(INFO, HTTP) << "Unknown resource during a bulk content retrieval: " << *it;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4030 }
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4031 }
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4032
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4033 for (std::set<std::string>::const_iterator
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4034 it = interest.begin(); it != interest.end(); ++it)
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4035 {
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4036 Json::Value item;
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	4037 std::set<DicomTag> emptyRequestedTags; // not supported for bulk content
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	4038
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	4039 if (OrthancRestApi::GetContext(call).ExpandResource(item, it, level, format, emptyRequestedTags, true / allowStorageAccess */))
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4040 {
4714 8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4041 if (metadata)
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4042 {
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4043 AddMetadata(item[METADATA], index, *it, level);
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4044 }
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4045
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4046 answer.append(item);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4047 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4048 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4049 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4050 else
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4051 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4052 // Simple case: We return the queried resources as such
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4053 std::list<std::string> resources;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4054 SerializationToolbox::ReadListOfStrings(resources, request, "Resources");
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4055
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4056 for (std::list<std::string>::const_iterator
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4057 it = resources.begin(); it != resources.end(); ++it)
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4058 {
4714 8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4059 ResourceType level;
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4060 Json::Value item;
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	4061 std::set<DicomTag> emptyRequestedTags; // not supported for bulk content
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	4062
4714 8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4063 if (index.LookupResourceType(level, *it) &&
5058 d4e5ca0c9307 Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0) Alain Mazy <am@osimis.io> parents: 5054 diff changeset	4064 OrthancRestApi::GetContext(call).ExpandResource(item, it, level, format, emptyRequestedTags, true / allowStorageAccess */))
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4065 {
4714 8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4066 if (metadata)
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4067 {
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4068 AddMetadata(item[METADATA], index, *it, level);
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4069 }
8ffe2fdb541f added argument "Metadata" to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4699 diff changeset	4070
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4071 answer.append(item);
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4072 }
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4073 else
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4074 {
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4075 CLOG(INFO, HTTP) << "Unknown resource during a bulk content retrieval: " << *it;
facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4076 }
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4077 }
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4078 }
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4079
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4080 call.GetOutput().AnswerJson(answer);
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4081 }
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4082 }
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4083
d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4084
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4085 static void BulkDelete(RestApiPostCall& call)
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4086 {
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4087 if (call.IsDocumentation())
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4088 {
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4089 call.GetDocumentation()
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4090 .SetTag("System")
4879 c728d8f25e5a fix doc Alain Mazy <am@osimis.io> parents: 4858 diff changeset	4091 .SetSummary("Delete a set of resources")
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4092 .SetRequestField("Resources", RestApiCallDocumentation::Type_JsonListOfStrings,
4699 facea16b055b added the "Level" argument to "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4698 diff changeset	4093 "List of the Orthanc identifiers of the patients/studies/series/instances of interest.", true)
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4094 .SetDescription("Delete all the DICOM patients, studies, series or instances "
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4095 "whose identifiers are provided in the `Resources` field.");
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4096 return;
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4097 }
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4098
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4099 ServerContext& context = OrthancRestApi::GetContext(call);
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4100
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4101 Json::Value request;
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4102 if (!call.ParseJsonRequest(request) \|\|
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4103 request.type() != Json::objectValue)
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4104 {
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4105 throw OrthancException(ErrorCode_BadRequest,
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4106 "The body must contain a JSON object");
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4107 }
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4108 else
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4109 {
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4110 std::set<std::string> resources;
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4111 SerializationToolbox::ReadSetOfStrings(resources, request, "Resources");
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4112
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4113 for (std::set<std::string>::const_iterator
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4114 it = resources.begin(); it != resources.end(); ++it)
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4115 {
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4116 ResourceType type;
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4117 Json::Value remainingAncestor; // Unused
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4118
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4119 if (!context.GetIndex().LookupResourceType(type, *it) \|\|
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4120 !context.DeleteResource(remainingAncestor, *it, type))
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4121 {
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4122 CLOG(INFO, HTTP) << "Unknown resource during a bulk deletion: " << *it;
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4123 }
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4124 }
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4125
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4126 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4127 }
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4128 }
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4129
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4130
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4131 void OrthancRestApi::RegisterResources()
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4132 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4133 Register("/instances", ListResources<ResourceType_Instance>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4134 Register("/patients", ListResources<ResourceType_Patient>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4135 Register("/series", ListResources<ResourceType_Series>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4136 Register("/studies", ListResources<ResourceType_Study>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4137
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4138 Register("/instances/{id}", DeleteSingleResource<ResourceType_Instance>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4139 Register("/instances/{id}", GetSingleResource<ResourceType_Instance>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4140 Register("/patients/{id}", DeleteSingleResource<ResourceType_Patient>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4141 Register("/patients/{id}", GetSingleResource<ResourceType_Patient>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4142 Register("/series/{id}", DeleteSingleResource<ResourceType_Series>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4143 Register("/series/{id}", GetSingleResource<ResourceType_Series>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4144 Register("/studies/{id}", DeleteSingleResource<ResourceType_Study>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4145 Register("/studies/{id}", GetSingleResource<ResourceType_Study>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4146
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4147 Register("/instances/{id}/statistics", GetResourceStatistics);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4148 Register("/patients/{id}/statistics", GetResourceStatistics);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4149 Register("/studies/{id}/statistics", GetResourceStatistics);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4150 Register("/series/{id}/statistics", GetResourceStatistics);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4151
964 cc7a4ae474c1 simplify has a GET argument Sebastien Jodogne <s.jodogne@gmail.com> parents: 963 diff changeset	4152 Register("/patients/{id}/shared-tags", GetSharedTags);
cc7a4ae474c1 simplify has a GET argument Sebastien Jodogne <s.jodogne@gmail.com> parents: 963 diff changeset	4153 Register("/series/{id}/shared-tags", GetSharedTags);
cc7a4ae474c1 simplify has a GET argument Sebastien Jodogne <s.jodogne@gmail.com> parents: 963 diff changeset	4154 Register("/studies/{id}/shared-tags", GetSharedTags);
958 1fbe89dc18b5 extraction of the shared tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 874 diff changeset	4155
1276 6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	4156 Register("/instances/{id}/module", GetModule<ResourceType_Instance, DicomModule_Instance>);
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	4157 Register("/patients/{id}/module", GetModule<ResourceType_Patient, DicomModule_Patient>);
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	4158 Register("/series/{id}/module", GetModule<ResourceType_Series, DicomModule_Series>);
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	4159 Register("/studies/{id}/module", GetModule<ResourceType_Study, DicomModule_Study>);
6164f7200c43 refactoring modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 1201 diff changeset	4160 Register("/studies/{id}/module-patient", GetModule<ResourceType_Study, DicomModule_Patient>);
963 81134ea872ff retrieve values of modules Sebastien Jodogne <s.jodogne@gmail.com> parents: 960 diff changeset	4161
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4162 Register("/instances/{id}/file", GetInstanceFile);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4163 Register("/instances/{id}/export", ExportInstanceFile);
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	4164 Register("/instances/{id}/tags", GetInstanceTags);
569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	4165 Register("/instances/{id}/simplified-tags", GetInstanceSimplifiedTags);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4166 Register("/instances/{id}/frames", ListFrames);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4167
4424 83371ccdfe80 openapi documentation is now completed Sebastien Jodogne <s.jodogne@gmail.com> parents: 4422 diff changeset	4168 Register("/instances/{id}/frames/{frame}", RestApi::AutoListChildren);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4169 Register("/instances/{id}/frames/{frame}/preview", GetImage<ImageExtractionMode_Preview>);
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	4170 Register("/instances/{id}/frames/{frame}/rendered", GetRenderedFrame);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4171 Register("/instances/{id}/frames/{frame}/image-uint8", GetImage<ImageExtractionMode_UInt8>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4172 Register("/instances/{id}/frames/{frame}/image-uint16", GetImage<ImageExtractionMode_UInt16>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4173 Register("/instances/{id}/frames/{frame}/image-int16", GetImage<ImageExtractionMode_Int16>);
874 87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	4174 Register("/instances/{id}/frames/{frame}/matlab", GetMatlabImage);
2408 26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	4175 Register("/instances/{id}/frames/{frame}/raw", GetRawFrame<false>);
26a0cc24d48d New URI: "/instances/.../frames/.../raw.gz" to compress raw frames using gzip Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	4176 Register("/instances/{id}/frames/{frame}/raw.gz", GetRawFrame<true>);
4902 df86d2505df8 Orthanc 1.9.8 is now known as Orthanc 1.10.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4892 diff changeset	4177 Register("/instances/{id}/frames/{frame}/numpy", GetNumpyFrame); // New in Orthanc 1.10.0
1556 b8dc2f855a83 Preview of PDF files encapsulated in DICOM from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	4178 Register("/instances/{id}/pdf", ExtractPdf);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4179 Register("/instances/{id}/preview", GetImage<ImageExtractionMode_Preview>);
3683 12253ddefe5a skeleton for new route: /instances/{id}/rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	4180 Register("/instances/{id}/rendered", GetRenderedFrame);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4181 Register("/instances/{id}/image-uint8", GetImage<ImageExtractionMode_UInt8>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4182 Register("/instances/{id}/image-uint16", GetImage<ImageExtractionMode_UInt16>);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4183 Register("/instances/{id}/image-int16", GetImage<ImageExtractionMode_Int16>);
874 87791ebc1f50 download matlab images Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	4184 Register("/instances/{id}/matlab", GetMatlabImage);
1831 3ae2ff249675 "/instances/.../header" to get the meta information (header) of the DICOM instance Sebastien Jodogne <s.jodogne@gmail.com> parents: 1826 diff changeset	4185 Register("/instances/{id}/header", GetInstanceHeader);
4902 df86d2505df8 Orthanc 1.9.8 is now known as Orthanc 1.10.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4892 diff changeset	4186 Register("/instances/{id}/numpy", GetNumpyInstance); // New in Orthanc 1.10.0
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4187
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4188 Register("/patients/{id}/protected", IsProtectedPatient);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4189 Register("/patients/{id}/protected", SetPatientProtection);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4190
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4191 std::vector<std::string> resourceTypes;
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4192 resourceTypes.push_back("patients");
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4193 resourceTypes.push_back("studies");
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4194 resourceTypes.push_back("series");
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4195 resourceTypes.push_back("instances");
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4196
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4197 for (size_t i = 0; i < resourceTypes.size(); i++)
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4198 {
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4199 Register("/" + resourceTypes[i] + "/{id}/metadata", ListMetadata);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4200 Register("/" + resourceTypes[i] + "/{id}/metadata/{name}", DeleteMetadata);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4201 Register("/" + resourceTypes[i] + "/{id}/metadata/{name}", GetMetadata);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4202 Register("/" + resourceTypes[i] + "/{id}/metadata/{name}", SetMetadata);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4203
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	4204 // New in Orthanc 1.12.0
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	4205 Register("/" + resourceTypes[i] + "/{id}/labels", ListLabels);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	4206 Register("/" + resourceTypes[i] + "/{id}/labels/{label}", GetLabel);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	4207 Register("/" + resourceTypes[i] + "/{id}/labels/{label}", RemoveLabel);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	4208 Register("/" + resourceTypes[i] + "/{id}/labels/{label}", AddLabel);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5200 diff changeset	4209
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4210 Register("/" + resourceTypes[i] + "/{id}/attachments", ListAttachments);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4211 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}", DeleteAttachment);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4212 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}", GetAttachmentOperations);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4213 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}", UploadAttachment);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4214 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/compress", ChangeAttachmentCompression<CompressionType_ZlibWithSize>);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4215 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/compressed-data", GetAttachmentData<0>);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4216 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/compressed-md5", GetAttachmentCompressedMD5);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4217 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/compressed-size", GetAttachmentCompressedSize);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4218 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/data", GetAttachmentData<1>);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4219 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/is-compressed", IsAttachmentCompressed);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4220 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/md5", GetAttachmentMD5);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4221 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/size", GetAttachmentSize);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4222 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/uncompress", ChangeAttachmentCompression<CompressionType_None>);
4883 504624b0a062 Added "/patients\|studies\|series\|instances/{...}/attachments/{...}/info" route to retrieve the full information about an attachment (size, type, MD5 and UUID) Alain Mazy <am@osimis.io> parents: 4880 diff changeset	4223 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/info", GetAttachmentInfo);
4409 5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4224 Register("/" + resourceTypes[i] + "/{id}/attachments/{name}/verify-md5", VerifyAttachment);
5784a9eaf502 cont openapi Sebastien Jodogne <s.jodogne@gmail.com> parents: 4408 diff changeset	4225 }
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	4226
2129 0c09d1af22f3 "/tools/invalidate-tags" to invalidate the JSON summary of all the DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 2128 diff changeset	4227 Register("/tools/invalidate-tags", InvalidateTags);
1139 f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	4228 Register("/tools/lookup", Lookup);
1354 3dd494f201a1 ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 1342 diff changeset	4229 Register("/tools/find", Find);
1139 f167b672db94 /tools/lookup URI to map DICOM UIDs to Orthanc identifiers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1054 diff changeset	4230
1140 94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	4231 Register("/patients/{id}/studies", GetChildResources<ResourceType_Patient, ResourceType_Study>);
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	4232 Register("/patients/{id}/series", GetChildResources<ResourceType_Patient, ResourceType_Series>);
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	4233 Register("/patients/{id}/instances", GetChildResources<ResourceType_Patient, ResourceType_Instance>);
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	4234 Register("/studies/{id}/series", GetChildResources<ResourceType_Study, ResourceType_Series>);
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	4235 Register("/studies/{id}/instances", GetChildResources<ResourceType_Study, ResourceType_Instance>);
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	4236 Register("/series/{id}/instances", GetChildResources<ResourceType_Series, ResourceType_Instance>);
94c5f6623b3a URIs to get all the children of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1139 diff changeset	4237
1281 8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	4238 Register("/studies/{id}/patient", GetParentResource<ResourceType_Study, ResourceType_Patient>);
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	4239 Register("/series/{id}/patient", GetParentResource<ResourceType_Series, ResourceType_Patient>);
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	4240 Register("/series/{id}/study", GetParentResource<ResourceType_Series, ResourceType_Study>);
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	4241 Register("/instances/{id}/patient", GetParentResource<ResourceType_Instance, ResourceType_Patient>);
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	4242 Register("/instances/{id}/study", GetParentResource<ResourceType_Instance, ResourceType_Study>);
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	4243 Register("/instances/{id}/series", GetParentResource<ResourceType_Instance, ResourceType_Series>);
8dac11c78d71 URIs to get all the parents of a given resource in a single REST call Sebastien Jodogne <s.jodogne@gmail.com> parents: 1276 diff changeset	4244
1166 a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	4245 Register("/patients/{id}/instances-tags", GetChildInstancesTags);
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	4246 Register("/studies/{id}/instances-tags", GetChildInstancesTags);
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	4247 Register("/series/{id}/instances-tags", GetChildInstancesTags);
a921e3b5e763 bulk tags retrieval Sebastien Jodogne <s.jodogne@gmail.com> parents: 1146 diff changeset	4248
782 a60040857ce6 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 751 diff changeset	4249 Register("/instances/{id}/content/*", GetRawContent);
1702 9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	4250
9980875edc7c started work on SliceOrdering Sebastien Jodogne <s.jodogne@gmail.com> parents: 1701 diff changeset	4251 Register("/series/{id}/ordered-slices", OrderSlices);
4902 df86d2505df8 Orthanc 1.9.8 is now known as Orthanc 1.10.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4892 diff changeset	4252 Register("/series/{id}/numpy", GetNumpySeries); // New in Orthanc 1.10.0
2209 e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	4253
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	4254 Register("/patients/{id}/reconstruct", ReconstructResource<ResourceType_Patient>);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	4255 Register("/studies/{id}/reconstruct", ReconstructResource<ResourceType_Study>);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	4256 Register("/series/{id}/reconstruct", ReconstructResource<ResourceType_Series>);
e3fd5bc429a2 URI to reconstruct the main DICOM tags, the JSON summary and the metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	4257 Register("/instances/{id}/reconstruct", ReconstructResource<ResourceType_Instance>);
2804 d88970f1ffbf fix ordering of non-parallel slices + /tools/reconstruct Sebastien Jodogne <s.jodogne@gmail.com> parents: 2780 diff changeset	4258 Register("/tools/reconstruct", ReconstructAllResources);
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4259
4698 d16c3c7f11ef new route "/tools/bulk-content" to get the content of a set of resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4697 diff changeset	4260 Register("/tools/bulk-content", BulkContent);
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4661 diff changeset	4261 Register("/tools/bulk-delete", BulkDelete);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4262 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4263 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp @ 5596:81a29ad7fb4b find-refactoring