orthanc: OrthancServer/Sources/ServerEnumerations.cpp annotate

annotate OrthancServer/Sources/ServerEnumerations.cpp @ 5117:849000df79b6

fix missing handling of StoreStatus_StorageFull

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 02 Dec 2022 15:32:53 +0100
parents	e95fadefeb72
children	0ea402b4d901

rev	line source
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
dfa2899d9960 refactoring cont 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: 1856 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	4 * Department, University Hospital of Liege, Belgium
4870 43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * This program is free software: you can redistribute it and/or
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * modify it under the terms of the GNU General Public License as
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * published by the Free Software Foundation, either version 3 of the
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * License, or (at your option) any later version.
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 *
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * This program is distributed in the hope that it will be useful, but
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * General Public License for more details.
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * You should have received a copy of the GNU General Public License
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 **/
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 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"
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "ServerEnumerations.h"
dfa2899d9960 refactoring cont 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/OrthancException.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	27 #include "../../OrthancFramework/Sources/EnumerationDictionary.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	28 #include "../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	29 #include "../../OrthancFramework/Sources/Toolbox.h"
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	30
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	31 #include <boost/thread.hpp>
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33 namespace Orthanc
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	35 typedef std::map<FileContentType, std::string> MimeTypes;
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	36
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	37 static boost::mutex enumerationsMutex_;
3991 5d2348b39392 turning toolbox namespaces into classes to control visibility in shared libraries Sebastien Jodogne <s.jodogne@gmail.com> parents: 3931 diff changeset	38 static EnumerationDictionary<MetadataType> dictMetadataType_;
5d2348b39392 turning toolbox namespaces into classes to control visibility in shared libraries Sebastien Jodogne <s.jodogne@gmail.com> parents: 3931 diff changeset	39 static EnumerationDictionary<FileContentType> dictContentType_;
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	40 static MimeTypes mimeTypes_;
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	41
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	42 void InitializeServerEnumerations()
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	43 {
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	44 boost::mutex::scoped_lock lock(enumerationsMutex_);
1103 bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	45
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	46 dictMetadataType_.Clear();
bec1eccf976c Hot restart of Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	47 dictContentType_.Clear();
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 435 diff changeset	48
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	49 dictMetadataType_.Add(MetadataType_Instance_IndexInSeries, "IndexInSeries");
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	50 dictMetadataType_.Add(MetadataType_Instance_ReceptionDate, "ReceptionDate");
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	51 dictMetadataType_.Add(MetadataType_RemoteAet, "RemoteAET");
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	52 dictMetadataType_.Add(MetadataType_Series_ExpectedNumberOfInstances, "ExpectedNumberOfInstances");
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	53 dictMetadataType_.Add(MetadataType_ModifiedFrom, "ModifiedFrom");
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	54 dictMetadataType_.Add(MetadataType_AnonymizedFrom, "AnonymizedFrom");
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	55 dictMetadataType_.Add(MetadataType_LastUpdate, "LastUpdate");
1823 0ef4e6e66b56 "Origin" metadata for the instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 1773 diff changeset	56 dictMetadataType_.Add(MetadataType_Instance_Origin, "Origin");
2189 c4b3259c8bce New metadata automatically computed at the instance level: "TransferSyntax" Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	57 dictMetadataType_.Add(MetadataType_Instance_TransferSyntax, "TransferSyntax");
2208 90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2189 diff changeset	58 dictMetadataType_.Add(MetadataType_Instance_SopClassUid, "SopClassUid");
2726 46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	59 dictMetadataType_.Add(MetadataType_Instance_RemoteIp, "RemoteIP");
46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	60 dictMetadataType_.Add(MetadataType_Instance_CalledAet, "CalledAET");
46061a91c88a new metadata (RemoteIP, CalledAET, HttpUsername), "?expand" metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	61 dictMetadataType_.Add(MetadataType_Instance_HttpUsername, "HttpUsername");
4494 39192eb9b43d New metadata automatically computed at the instance level: "PixelDataOffset" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4474 diff changeset	62 dictMetadataType_.Add(MetadataType_Instance_PixelDataOffset, "PixelDataOffset");
4934 94a7b681b340 added configuration for extra main dicom tags + save signature in metadata + show warning if inconsistent main dicom tags Alain Mazy <am@osimis.io> parents: 4892 diff changeset	63 dictMetadataType_.Add(MetadataType_MainDicomTagsSignature, "MainDicomTagsSignature");
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4934 diff changeset	64 dictMetadataType_.Add(MetadataType_MainDicomSequences, "MainDicomSequences");
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	65
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	66 dictContentType_.Add(FileContentType_Dicom, "dicom");
697 dd1ce9a2844c access to attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 696 diff changeset	67 dictContentType_.Add(FileContentType_DicomAsJson, "dicom-as-json");
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4494 diff changeset	68 dictContentType_.Add(FileContentType_DicomUntilPixelData, "dicom-until-pixel-data");
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	69 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	70
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	71 void RegisterUserMetadata(int metadata,
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 620 diff changeset	72 const std::string& name)
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	73 {
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	74 boost::mutex::scoped_lock lock(enumerationsMutex_);
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	75
1773 613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	76 MetadataType type = static_cast<MetadataType>(metadata);
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	77
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	78 if (metadata < 0 \|\|
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	79 !IsUserMetadata(type))
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	80 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	81 LOG(ERROR) << "A user content type must have index between "
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	82 << static_cast<int>(MetadataType_StartUser) << " and "
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	83 << static_cast<int>(MetadataType_EndUser) << ", but \""
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	84 << name << "\" has index " << metadata;
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	85
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	86 throw OrthancException(ErrorCode_ParameterOutOfRange);
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	87 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	88
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	89 if (dictMetadataType_.Contains(type))
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	90 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	91 LOG(ERROR) << "Cannot associate user content type \""
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	92 << name << "\" with index " << metadata
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	93 << ", as this index is already used";
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	94
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	95 throw OrthancException(ErrorCode_ParameterOutOfRange);
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	96 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	97
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	98 dictMetadataType_.Add(type, name);
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	99 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	100
437 beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	101 std::string EnumerationToString(MetadataType type)
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	102 {
437 beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	103 // This function MUST return a "std::string" and not "const
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	104 // char*", as the result is not a static string
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	105 boost::mutex::scoped_lock lock(enumerationsMutex_);
437 beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	106 return dictMetadataType_.Translate(type);
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	107 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	108
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	109 MetadataType StringToMetadata(const std::string& str)
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	110 {
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	111 boost::mutex::scoped_lock lock(enumerationsMutex_);
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	112 return dictMetadataType_.Translate(str);
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	113 }
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	114
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	115 void RegisterUserContentType(int contentType,
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	116 const std::string& name,
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	117 const std::string& mime)
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	118 {
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	119 boost::mutex::scoped_lock lock(enumerationsMutex_);
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	120
1773 613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	121 FileContentType type = static_cast<FileContentType>(contentType);
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	122
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	123 if (contentType < 0 \|\|
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	124 !IsUserContentType(type))
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	125 {
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	126 LOG(ERROR) << "A user content type must have index between "
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	127 << static_cast<int>(FileContentType_StartUser) << " and "
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	128 << static_cast<int>(FileContentType_EndUser) << ", but \""
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	129 << name << "\" has index " << contentType;
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	130
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	131 throw OrthancException(ErrorCode_ParameterOutOfRange);
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	132 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	133
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	134 if (dictContentType_.Contains(type))
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	135 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	136 LOG(ERROR) << "Cannot associate user content type \""
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	137 << name << "\" with index " << contentType
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	138 << ", as this index is already used";
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	139
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	140 throw OrthancException(ErrorCode_ParameterOutOfRange);
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	141 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	142
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	143 dictContentType_.Add(type, name);
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	144 mimeTypes_[type] = mime;
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	145 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	146
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	147 std::string EnumerationToString(FileContentType type)
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	148 {
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	149 // This function MUST return a "std::string" and not "const
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	150 // char*", as the result is not a static string
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	151 boost::mutex::scoped_lock lock(enumerationsMutex_);
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	152 return dictContentType_.Translate(type);
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	153 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	154
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	155 std::string GetFileContentMime(FileContentType type)
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	156 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	157 if (type >= FileContentType_StartUser &&
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	158 type <= FileContentType_EndUser)
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	159 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	160 boost::mutex::scoped_lock lock(enumerationsMutex_);
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	161
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	162 MimeTypes::const_iterator it = mimeTypes_.find(type);
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	163 if (it != mimeTypes_.end())
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	164 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	165 return it->second;
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	166 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	167 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	168
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	169 switch (type)
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	170 {
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	171 case FileContentType_Dicom:
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	172 return EnumerationToString(MimeType_Dicom);
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	173
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	174 case FileContentType_DicomAsJson:
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	175 return MIME_JSON_UTF8;
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	176
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	177 default:
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	178 return EnumerationToString(MimeType_Binary);
1772 53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	179 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	180 }
53e045b5a8ec MIME content type can be associated to custom attachments (cf. "UserContentType") Sebastien Jodogne <s.jodogne@gmail.com> parents: 1724 diff changeset	181
696 4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	182 FileContentType StringToContentType(const std::string& str)
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	183 {
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	184 boost::mutex::scoped_lock lock(enumerationsMutex_);
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	185 return dictContentType_.Translate(str);
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	186 }
4c1860179cc5 dictionary of user-defined content types Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	187
3677 4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	188
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	189 FindStorageAccessMode StringToFindStorageAccessMode(const std::string& value)
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	190 {
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	191 if (value == "Always")
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	192 {
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	193 return FindStorageAccessMode_DiskOnLookupAndAnswer;
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	194 }
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	195 else if (value == "Never")
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	196 {
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	197 return FindStorageAccessMode_DatabaseOnly;
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	198 }
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	199 else if (value == "Answers")
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	200 {
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	201 return FindStorageAccessMode_DiskOnAnswer;
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	202 }
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	203 else
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	204 {
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	205 throw OrthancException(ErrorCode_ParameterOutOfRange,
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	206 "Configuration option \"StorageAccessOnFind\" "
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	207 "should be \"Always\", \"Never\" or \"Answers\": " + value);
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	208 }
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	209 }
3931 e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	210
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: 5036 diff changeset	211 bool IsStorageAccessAllowedForAnswers(FindStorageAccessMode mode)
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: 5036 diff changeset	212 {
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: 5036 diff changeset	213 return mode != FindStorageAccessMode_DatabaseOnly;
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: 5036 diff changeset	214 }
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: 5036 diff changeset	215
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: 5036 diff changeset	216 bool IsStorageAccessAllowedForLookup(FindStorageAccessMode mode)
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: 5036 diff changeset	217 {
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: 5036 diff changeset	218 return mode == FindStorageAccessMode_DiskOnLookupAndAnswer;
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: 5036 diff changeset	219 }
3931 e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	220
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	221 MaxStorageMode StringToMaxStorageMode(const std::string& value)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	222 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	223 if (value == "Recycle")
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	224 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	225 return MaxStorageMode_Recycle;
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	226 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	227 else if (value == "Reject")
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	228 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	229 return MaxStorageMode_Reject;
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	230 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	231 else
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	232 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	233 throw OrthancException(ErrorCode_ParameterOutOfRange,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	234 "Configuration option \"MaxStorageMode\" "
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	235 "should be \"Recycle\" or \"Reject\": " + value);
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	236 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	237 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5058 diff changeset	238
3931 e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	239 BuiltinDecoderTranscoderOrder StringToBuiltinDecoderTranscoderOrder(const std::string& value)
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	240 {
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	241 if (value == "Before")
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	242 {
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	243 return BuiltinDecoderTranscoderOrder_Before;
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	244 }
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	245 else if (value == "After")
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	246 {
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	247 return BuiltinDecoderTranscoderOrder_After;
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	248 }
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	249 else if (value == "Disabled")
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	250 {
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	251 return BuiltinDecoderTranscoderOrder_Disabled;
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	252 }
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	253 else
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	254 {
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	255 throw OrthancException(ErrorCode_ParameterOutOfRange,
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	256 "Configuration option \"BuiltinDecoderTranscoderOrder\" "
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	257 "should be \"After\", \"Before\" or \"Disabled\": " + value);
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	258 }
e6606d3ec892 new configuration option: BuiltinDecoderTranscoderOrder Sebastien Jodogne <s.jodogne@gmail.com> parents: 3677 diff changeset	259 }
4273 0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	260
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	261
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	262 Verbosity StringToVerbosity(const std::string& str)
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	263 {
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	264 if (str == "default")
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	265 {
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	266 return Verbosity_Default;
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	267 }
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	268 else if (str == "verbose")
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	269 {
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	270 return Verbosity_Verbose;
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	271 }
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	272 else if (str == "trace")
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	273 {
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	274 return Verbosity_Trace;
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	275 }
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	276 else
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	277 {
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	278 throw OrthancException(ErrorCode_ParameterOutOfRange,
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	279 "Verbosity can be \"default\", \"verbose\" or \"trace\": " + str);
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	280 }
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	281 }
3677 4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	282
4182cde57afb refactoring FindStorageAccessMode Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	283
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	284 std::string GetBasePath(ResourceType type,
7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	285 const std::string& publicId)
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	286 {
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	287 switch (type)
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	288 {
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	289 case ResourceType_Patient:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	290 return "/patients/" + publicId;
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	291
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	292 case ResourceType_Study:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	293 return "/studies/" + publicId;
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	294
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	295 case ResourceType_Series:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	296 return "/series/" + publicId;
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	297
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	298 case ResourceType_Instance:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	299 return "/instances/" + publicId;
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	300
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	301 default:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	302 throw OrthancException(ErrorCode_ParameterOutOfRange);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	303 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	304 }
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 199 diff changeset	305
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	306 const char* EnumerationToString(SeriesStatus status)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 switch (status)
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 {
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	310 case SeriesStatus_Complete:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	311 return "Complete";
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	313 case SeriesStatus_Missing:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	314 return "Missing";
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	316 case SeriesStatus_Inconsistent:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	317 return "Inconsistent";
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	319 case SeriesStatus_Unknown:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	320 return "Unknown";
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	322 default:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	323 throw OrthancException(ErrorCode_ParameterOutOfRange);
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 }
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	326
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	327 const char* EnumerationToString(StoreStatus status)
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	328 {
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	329 switch (status)
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	330 {
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	331 case StoreStatus_Success:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	332 return "Success";
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	333
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	334 case StoreStatus_AlreadyStored:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	335 return "AlreadyStored";
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	336
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	337 case StoreStatus_Failure:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	338 return "Failure";
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	339
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	340 case StoreStatus_FilteredOut:
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	341 return "FilteredOut";
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	342
5117 849000df79b6 fix missing handling of StoreStatus_StorageFull Sebastien Jodogne <s.jodogne@gmail.com> parents: 5061 diff changeset	343 case StoreStatus_StorageFull:
849000df79b6 fix missing handling of StoreStatus_StorageFull Sebastien Jodogne <s.jodogne@gmail.com> parents: 5061 diff changeset	344 return "StorageFull";
849000df79b6 fix missing handling of StoreStatus_StorageFull Sebastien Jodogne <s.jodogne@gmail.com> parents: 5061 diff changeset	345
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	346 default:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	347 throw OrthancException(ErrorCode_ParameterOutOfRange);
216 e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	348 }
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	349 }
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	350
e5d5d4a9a326 refactored upload of dicom through http Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	351
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	352 const char* EnumerationToString(ChangeType type)
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	353 {
7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	354 switch (type)
7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	355 {
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	356 case ChangeType_CompletedSeries:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	357 return "CompletedSeries";
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	358
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	359 case ChangeType_NewInstance:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	360 return "NewInstance";
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	361
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	362 case ChangeType_NewPatient:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	363 return "NewPatient";
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	364
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	365 case ChangeType_NewSeries:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	366 return "NewSeries";
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	367
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	368 case ChangeType_NewStudy:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	369 return "NewStudy";
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	370
315 fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	371 case ChangeType_AnonymizedStudy:
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	372 return "AnonymizedStudy";
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	373
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	374 case ChangeType_AnonymizedSeries:
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	375 return "AnonymizedSeries";
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	376
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	377 case ChangeType_ModifiedStudy:
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	378 return "ModifiedStudy";
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	379
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	380 case ChangeType_ModifiedSeries:
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	381 return "ModifiedSeries";
fc856d175d18 modifications Sebastien Jodogne <s.jodogne@gmail.com> parents: 250 diff changeset	382
348 1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	383 case ChangeType_AnonymizedPatient:
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	384 return "AnonymizedPatient";
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	385
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	386 case ChangeType_ModifiedPatient:
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	387 return "ModifiedPatient";
1082e8121d10 refactoring anonymization/modification Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	388
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	389 case ChangeType_StablePatient:
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	390 return "StablePatient";
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	391
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	392 case ChangeType_StableStudy:
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	393 return "StableStudy";
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	394
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	395 case ChangeType_StableSeries:
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	396 return "StableSeries";
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	397
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	398 case ChangeType_Deleted:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	399 return "Deleted";
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1163 diff changeset	400
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	401 case ChangeType_NewChildInstance:
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	402 return "NewChildInstance";
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	403
1773 613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	404 case ChangeType_UpdatedAttachment:
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	405 return "UpdatedAttachment";
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	406
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	407 case ChangeType_UpdatedMetadata:
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	408 return "UpdatedMetadata";
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	409
250 f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	410 default:
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	411 throw OrthancException(ErrorCode_ParameterOutOfRange);
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	412 }
f23318b11b39 creation of zip files Sebastien Jodogne <s.jodogne@gmail.com> parents: 216 diff changeset	413 }
204 7f4acf490179 changes api Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	414
4273 0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	415
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	416 const char* EnumerationToString(Verbosity verbosity)
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	417 {
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	418 switch (verbosity)
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	419 {
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	420 case Verbosity_Default:
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	421 return "default";
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	422
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	423 case Verbosity_Verbose:
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	424 return "verbose";
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	425
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	426 case Verbosity_Trace:
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	427 return "trace";
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	428
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	429 default:
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	430 throw OrthancException(ErrorCode_ParameterOutOfRange);
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	431 }
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	432 }
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	433
2309 4dc313b9a20a Argument "DicomVersion" in URIs "/{...}/{...}/anonymization" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	434
1773 613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	435 bool IsUserMetadata(MetadataType metadata)
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	436 {
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	437 return (metadata >= MetadataType_StartUser &&
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	438 metadata <= MetadataType_EndUser);
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1772 diff changeset	439 }
4469 5ffa4e14e4bd move old enum TransferSyntax from OrthancFramework to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	440
5ffa4e14e4bd move old enum TransferSyntax from OrthancFramework to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	441
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: 4472 diff changeset	442 void GetTransferSyntaxGroup(std::set<DicomTransferSyntax>& target,
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: 4472 diff changeset	443 TransferSyntaxGroup source)
4469 5ffa4e14e4bd move old enum TransferSyntax from OrthancFramework to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4460 diff changeset	444 {
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: 4472 diff changeset	445 target.clear();
4472 28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	446
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	447 switch (source)
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	448 {
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	449 // Transfer syntaxes supported since Orthanc 0.7.2
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	450 case TransferSyntaxGroup_Deflated:
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	451 target.insert(DicomTransferSyntax_DeflatedLittleEndianExplicit);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	452 break;
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	453
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	454 case TransferSyntaxGroup_Jpeg:
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	455 target.insert(DicomTransferSyntax_JPEGProcess1);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	456 target.insert(DicomTransferSyntax_JPEGProcess2_4);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	457 target.insert(DicomTransferSyntax_JPEGProcess3_5);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	458 target.insert(DicomTransferSyntax_JPEGProcess6_8);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	459 target.insert(DicomTransferSyntax_JPEGProcess7_9);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	460 target.insert(DicomTransferSyntax_JPEGProcess10_12);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	461 target.insert(DicomTransferSyntax_JPEGProcess11_13);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	462 target.insert(DicomTransferSyntax_JPEGProcess14);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	463 target.insert(DicomTransferSyntax_JPEGProcess15);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	464 target.insert(DicomTransferSyntax_JPEGProcess16_18);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	465 target.insert(DicomTransferSyntax_JPEGProcess17_19);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	466 target.insert(DicomTransferSyntax_JPEGProcess20_22);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	467 target.insert(DicomTransferSyntax_JPEGProcess21_23);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	468 target.insert(DicomTransferSyntax_JPEGProcess24_26);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	469 target.insert(DicomTransferSyntax_JPEGProcess25_27);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	470 target.insert(DicomTransferSyntax_JPEGProcess28);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	471 target.insert(DicomTransferSyntax_JPEGProcess29);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	472 target.insert(DicomTransferSyntax_JPEGProcess14SV1);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	473 break;
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	474
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	475 case TransferSyntaxGroup_Jpeg2000:
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	476 target.insert(DicomTransferSyntax_JPEG2000);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	477 target.insert(DicomTransferSyntax_JPEG2000LosslessOnly);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	478 target.insert(DicomTransferSyntax_JPEG2000Multicomponent);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	479 target.insert(DicomTransferSyntax_JPEG2000MulticomponentLosslessOnly);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	480 break;
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	481
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	482 case TransferSyntaxGroup_JpegLossless:
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	483 target.insert(DicomTransferSyntax_JPEGLSLossless);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	484 target.insert(DicomTransferSyntax_JPEGLSLossy);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	485 break;
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	486
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	487 case TransferSyntaxGroup_Jpip:
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	488 target.insert(DicomTransferSyntax_JPIPReferenced);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	489 target.insert(DicomTransferSyntax_JPIPReferencedDeflate);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	490 break;
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	491
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	492 case TransferSyntaxGroup_Mpeg2:
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	493 target.insert(DicomTransferSyntax_MPEG2MainProfileAtMainLevel);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	494 target.insert(DicomTransferSyntax_MPEG2MainProfileAtHighLevel);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	495 break;
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	496
4474 f8c1d94363b6 new configuration options: "AcceptedTransferSyntaxes" and "H265TransferSyntaxAccepted" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	497 case TransferSyntaxGroup_Rle:
f8c1d94363b6 new configuration options: "AcceptedTransferSyntaxes" and "H265TransferSyntaxAccepted" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	498 target.insert(DicomTransferSyntax_RLELossless);
f8c1d94363b6 new configuration options: "AcceptedTransferSyntaxes" and "H265TransferSyntaxAccepted" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	499 break;
f8c1d94363b6 new configuration options: "AcceptedTransferSyntaxes" and "H265TransferSyntaxAccepted" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	500
4472 28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	501 case TransferSyntaxGroup_Mpeg4:
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	502 // New in Orthanc 1.6.0
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	503 target.insert(DicomTransferSyntax_MPEG4BDcompatibleHighProfileLevel4_1);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	504 target.insert(DicomTransferSyntax_MPEG4HighProfileLevel4_1);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	505 target.insert(DicomTransferSyntax_MPEG4HighProfileLevel4_2_For2DVideo);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	506 target.insert(DicomTransferSyntax_MPEG4HighProfileLevel4_2_For3DVideo);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	507 target.insert(DicomTransferSyntax_MPEG4StereoHighProfileLevel4_2);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	508 break;
4474 f8c1d94363b6 new configuration options: "AcceptedTransferSyntaxes" and "H265TransferSyntaxAccepted" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	509
f8c1d94363b6 new configuration options: "AcceptedTransferSyntaxes" and "H265TransferSyntaxAccepted" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	510 case TransferSyntaxGroup_H265:
f8c1d94363b6 new configuration options: "AcceptedTransferSyntaxes" and "H265TransferSyntaxAccepted" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	511 // New in Orthanc 1.9.0
f8c1d94363b6 new configuration options: "AcceptedTransferSyntaxes" and "H265TransferSyntaxAccepted" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	512 target.insert(DicomTransferSyntax_HEVCMainProfileLevel5_1);
f8c1d94363b6 new configuration options: "AcceptedTransferSyntaxes" and "H265TransferSyntaxAccepted" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	513 target.insert(DicomTransferSyntax_HEVCMain10ProfileLevel5_1);
f8c1d94363b6 new configuration options: "AcceptedTransferSyntaxes" and "H265TransferSyntaxAccepted" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4473 diff changeset	514 break;
4472 28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	515
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	516 default:
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	517 throw OrthancException(ErrorCode_ParameterOutOfRange);
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	518 }
28a4baadde17 rename TransferSyntax enum as TransferSyntaxGroup Sebastien Jodogne <s.jodogne@gmail.com> parents: 4469 diff changeset	519 }
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/ServerEnumerations.cpp @ 5117:849000df79b6