orthanc: OrthancServer/OrthancRestApi/OrthancRestSystem.cpp annotate

annotate OrthancServer/OrthancRestApi/OrthancRestSystem.cpp @ 3705:d8b214a46b91 storage-commitment

integration mainline->storage-commitment

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 27 Feb 2020 12:07:19 +0100
parents	ea8c1c0e81eb
children	e3b3af80732d

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: 1668 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1233 diff changeset	4 * Department, University Hospital of Liege, Belgium
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3535 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * 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	9 * published by the Free Software Foundation, either version 3 of the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * 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	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * 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	30 * 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	31 **/
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	34 #include "../PrecompiledHeadersServer.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "OrthancRestApi.h"
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
3097 ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	37 #include "../../Core/DicomParsing/FromDcmtkBridge.h"
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	38 #include "../../Core/MetricsRegistry.h"
3097 ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	39 #include "../../Plugins/Engine/OrthancPlugins.h"
ac72032d69a2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	40 #include "../../Plugins/Engine/PluginsManager.h"
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	41 #include "../OrthancConfiguration.h"
1437 02f5a3f5c0a0 access to the REST API from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1434 diff changeset	42 #include "../ServerContext.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
3672 ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	45 static const char* LOG_LEVEL_DEFAULT = "default";
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	46 static const char* LOG_LEVEL_VERBOSE = "verbose";
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	47 static const char* LOG_LEVEL_TRACE = "trace";
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	48
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	49
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 namespace Orthanc
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 // System information -------------------------------------------------------
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	54 static void ServeRoot(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 call.GetOutput().Redirect("app/explorer.html");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	59 static void GetSystemInformation(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 {
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	61 ServerContext& context = OrthancRestApi::GetContext(call);
2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	62
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 Json::Value result = Json::objectValue;
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64
2444 d9e3781d2023 "/system" URI returns the version of the Orthanc REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 2382 diff changeset	65 result["ApiVersion"] = ORTHANC_API_VERSION;
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	66 result["Version"] = ORTHANC_VERSION;
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1632 diff changeset	67 result["DatabaseVersion"] = OrthancRestApi::GetIndex(call).GetDatabaseVersion();
3534 cac8ffcb9cef forcing AuthenticationEnabled to false is considered as insecure if remote access is allowed Sebastien Jodogne <s.jodogne@gmail.com> parents: 3533 diff changeset	68 result["IsHttpServerSecure"] = context.IsHttpServerSecure(); // New in Orthanc 1.5.8
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	69
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	70 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	71 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	72 result["DicomAet"] = lock.GetConfiguration().GetStringParameter("DicomAet", "ORTHANC");
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	73 result["DicomPort"] = lock.GetConfiguration().GetUnsignedIntegerParameter("DicomPort", 4242);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	74 result["HttpPort"] = lock.GetConfiguration().GetUnsignedIntegerParameter("HttpPort", 8042);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	75 result["Name"] = lock.GetConfiguration().GetStringParameter("Name", "");
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	76 }
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	78 result["StorageAreaPlugin"] = Json::nullValue;
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	79 result["DatabaseBackendPlugin"] = Json::nullValue;
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	80
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	81 #if ORTHANC_ENABLE_PLUGINS == 1
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	82 result["PluginsEnabled"] = true;
3533 2090ec6a83a5 create a default user if none is provided, while issuing a warning in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 3526 diff changeset	83 const OrthancPlugins& plugins = context.GetPlugins();
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	84
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	85 if (plugins.HasStorageArea())
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	86 {
1631 0d074f5f6069 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	87 std::string p = plugins.GetStorageAreaLibrary().GetPath();
0d074f5f6069 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	88 result["StorageAreaPlugin"] = boost::filesystem::canonical(p).string();
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	89 }
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	90
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	91 if (plugins.HasDatabaseBackend())
ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	92 {
1631 0d074f5f6069 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	93 std::string p = plugins.GetDatabaseBackendLibrary().GetPath();
0d074f5f6069 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1630 diff changeset	94 result["DatabaseBackendPlugin"] = boost::filesystem::canonical(p).string();
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	95 }
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	96 #else
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	97 result["PluginsEnabled"] = false;
eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	98 #endif
1630 ffd23c0104af "/system" URI gives information about the plugins used for storage area and DB back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1597 diff changeset	99
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	103 static void GetStatistics(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104 {
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	105 static const uint64_t MEGA_BYTES = 1024 * 1024;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	106
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	107 uint64_t diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	108 OrthancRestApi::GetIndex(call).GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	109 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	110
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 Json::Value result = Json::objectValue;
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	112 result["TotalDiskSize"] = boost::lexical_cast<std::string>(diskSize);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	113 result["TotalUncompressedSize"] = boost::lexical_cast<std::string>(uncompressedSize);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	114 result["TotalDiskSizeMB"] = static_cast<unsigned int>(diskSize / MEGA_BYTES);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	115 result["TotalUncompressedSizeMB"] = static_cast<unsigned int>(uncompressedSize / MEGA_BYTES);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	116 result["CountPatients"] = static_cast<unsigned int>(countPatients);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	117 result["CountStudies"] = static_cast<unsigned int>(countStudies);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	118 result["CountSeries"] = static_cast<unsigned int>(countSeries);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	119 result["CountInstances"] = static_cast<unsigned int>(countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	120
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 call.GetOutput().AnswerJson(result);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	124 static void GenerateUid(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126 std::string level = call.GetArgument("level", "");
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 if (level == "patient")
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	129 call.GetOutput().AnswerBuffer(FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType_Patient), MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 else if (level == "study")
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	133 call.GetOutput().AnswerBuffer(FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType_Study), MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 else if (level == "series")
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	137 call.GetOutput().AnswerBuffer(FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType_Series), MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 else if (level == "instance")
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	141 call.GetOutput().AnswerBuffer(FromDcmtkBridge::GenerateUniqueIdentifier(ResourceType_Instance), MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	145 static void ExecuteScript(RestApiPostCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 {
3535 41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	147 ServerContext& context = OrthancRestApi::GetContext(call);
3526 f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	148
3535 41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	149 if (!context.IsExecuteLuaEnabled())
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	150 {
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	151 LOG(ERROR) << "The URI /tools/execute-script is disallowed for security, "
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	152 << "check your configuration file";
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	153 call.GetOutput().SignalError(HttpStatus_403_Forbidden);
41365091a41e display a security warning in the logs at startup when ExecuteLuaEnabled is true Alain Mazy <alain@mazy.be> parents: 3534 diff changeset	154 return;
3526 f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	155 }
f07352e0375c new configuration option ExecuteLuaEnabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 3401 diff changeset	156
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 std::string result;
1446 8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	158 std::string command;
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	159 call.BodyToString(command);
8dc80ba768aa refactoring: IHttpHandler does not use std::string to hold the request body Sebastien Jodogne <s.jodogne@gmail.com> parents: 1437 diff changeset	160
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	161 {
2617 912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	162 LuaScripting::Lock lock(context.GetLuaScripting());
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	163 lock.GetLua().Execute(result, command);
996 cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	164 }
cf52f3bcb2b3 clarification of Lua classes wrt multithreading Sebastien Jodogne <s.jodogne@gmail.com> parents: 974 diff changeset	165
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	166 call.GetOutput().AnswerBuffer(result, MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168
2475 8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	169 template <bool UTC>
974 83622b0f544c refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	170 static void GetNowIsoString(RestApiGetCall& call)
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	172 call.GetOutput().AnswerBuffer(SystemToolbox::GetNowIsoString(UTC), MimeType_PlainText);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174
1073 01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	175
01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	176 static void GetDicomConformanceStatement(RestApiGetCall& call)
01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	177 {
01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	178 std::string statement;
01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	179 GetFileResource(statement, EmbeddedResources::DICOM_CONFORMANCE_STATEMENT);
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	180 call.GetOutput().AnswerBuffer(statement, MimeType_PlainText);
1073 01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	181 }
01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	182
01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	183
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	184 static void GetDefaultEncoding(RestApiGetCall& call)
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	185 {
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	186 Encoding encoding = GetDefaultDicomEncoding();
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	187 call.GetOutput().AnswerBuffer(EnumerationToString(encoding), MimeType_PlainText);
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	188 }
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	189
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	190
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	191 static void SetDefaultEncoding(RestApiPutCall& call)
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	192 {
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	193 std::string body;
962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	194 call.BodyToString(body);
962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	195
962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	196 Encoding encoding = StringToEncoding(body.c_str());
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	197
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	198 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	199 OrthancConfiguration::WriterLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	200 lock.GetConfiguration().SetDefaultEncoding(encoding);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	201 }
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	202
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	203 call.GetOutput().AnswerBuffer(EnumerationToString(encoding), MimeType_PlainText);
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	204 }
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	205
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	206
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	207
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	208 // Plugins information ------------------------------------------------------
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	209
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	210 static void ListPlugins(RestApiGetCall& call)
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	211 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	212 Json::Value v = Json::arrayValue;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	213
1233 eac00401cb96 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	214 v.append("explorer.js");
eac00401cb96 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1232 diff changeset	215
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	216 if (OrthancRestApi::GetContext(call).HasPlugins())
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	217 {
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	218 #if ORTHANC_ENABLE_PLUGINS == 1
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	219 std::list<std::string> plugins;
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	220 OrthancRestApi::GetContext(call).GetPlugins().GetManager().ListPlugins(plugins);
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	221
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	222 for (std::list<std::string>::const_iterator
1303 bba8a47922d1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	223 it = plugins.begin(); it != plugins.end(); ++it)
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	224 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	225 v.append(*it);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	226 }
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	227 #endif
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	228 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	229
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	230 call.GetOutput().AnswerJson(v);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	231 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	232
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	233
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	234 static void GetPlugin(RestApiGetCall& call)
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	235 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	236 if (!OrthancRestApi::GetContext(call).HasPlugins())
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	237 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	238 return;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	239 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	240
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	241 #if ORTHANC_ENABLE_PLUGINS == 1
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	242 const PluginsManager& manager = OrthancRestApi::GetContext(call).GetPlugins().GetManager();
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	243 std::string id = call.GetUriComponent("id", "");
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	244
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	245 if (manager.HasPlugin(id))
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	246 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	247 Json::Value v = Json::objectValue;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	248 v["ID"] = id;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	249 v["Version"] = manager.GetPluginVersion(id);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	250
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	251 const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetPlugins();
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	252 const char *c = plugins.GetProperty(id.c_str(), _OrthancPluginProperty_RootUri);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	253 if (c != NULL)
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	254 {
1597 415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	255 std::string root = c;
415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	256 if (!root.empty())
415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	257 {
415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	258 // Turn the root URI into a URI relative to "/app/explorer.js"
415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	259 if (root[0] == '/')
415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	260 {
415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	261 root = ".." + root;
415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	262 }
415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	263
415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	264 v["RootUri"] = root;
415dfd1d1c61 Improvements to the sample "ServeFolders" plugin Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	265 }
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	266 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	267
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	268 c = plugins.GetProperty(id.c_str(), _OrthancPluginProperty_Description);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	269 if (c != NULL)
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	270 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	271 v["Description"] = c;
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	272 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	273
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	274 c = plugins.GetProperty(id.c_str(), _OrthancPluginProperty_OrthancExplorer);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	275 v["ExtendsOrthancExplorer"] = (c != NULL);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	276
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	277 call.GetOutput().AnswerJson(v);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	278 }
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	279 #endif
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	280 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	281
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	282
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	283 static void GetOrthancExplorerPlugins(RestApiGetCall& call)
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	284 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	285 std::string s = "// Extensions to Orthanc Explorer by the registered plugins\n\n";
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	286
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	287 if (OrthancRestApi::GetContext(call).HasPlugins())
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	288 {
2136 dd609a99d39a uniformization of the macro naming Sebastien Jodogne <s.jodogne@gmail.com> parents: 2069 diff changeset	289 #if ORTHANC_ENABLE_PLUGINS == 1
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	290 const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetPlugins();
f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	291 const PluginsManager& manager = plugins.GetManager();
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	292
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	293 std::list<std::string> lst;
1434 f9cd40166269 refactoring of OrthancPlugins, improvement in ServeFolders Sebastien Jodogne <s.jodogne@gmail.com> parents: 1433 diff changeset	294 manager.ListPlugins(lst);
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	295
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	296 for (std::list<std::string>::const_iterator
1303 bba8a47922d1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	297 it = lst.begin(); it != lst.end(); ++it)
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	298 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	299 const char* tmp = plugins.GetProperty(it->c_str(), _OrthancPluginProperty_OrthancExplorer);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	300 if (tmp != NULL)
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	301 {
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	302 s += "/*\n From plugin: " + it + " (version " + manager.GetPluginVersion(it) + ")\n **/\n\n";
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	303 s += std::string(tmp) + "\n\n";
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	304 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	305 }
1632 eb8fbcf008b5 fix build with plugins disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	306 #endif
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	307 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	308
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	309 call.GetOutput().AnswerBuffer(s, MimeType_JavaScript);
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	310 }
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	311
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	312
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	313
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	314
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	315 // Jobs information ------------------------------------------------------
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	316
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	317 static void ListJobs(RestApiGetCall& call)
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	318 {
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	319 bool expand = call.HasArgument("expand");
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	320
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	321 Json::Value v = Json::arrayValue;
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	322
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	323 std::set<std::string> jobs;
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	324 OrthancRestApi::GetContext(call).GetJobsEngine().GetRegistry().ListJobs(jobs);
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	325
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	326 for (std::set<std::string>::const_iterator it = jobs.begin();
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	327 it != jobs.end(); ++it)
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	328 {
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	329 if (expand)
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	330 {
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	331 JobInfo info;
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	332 if (OrthancRestApi::GetContext(call).GetJobsEngine().GetRegistry().GetJobInfo(info, *it))
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	333 {
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	334 Json::Value tmp;
2647 73d7d95dd75e removal of internal job information Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	335 info.Format(tmp);
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	336 v.append(tmp);
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	337 }
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	338 }
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	339 else
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	340 {
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	341 v.append(*it);
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	342 }
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	343 }
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	344
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	345 call.GetOutput().AnswerJson(v);
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	346 }
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	347
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	348 static void GetJobInfo(RestApiGetCall& call)
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	349 {
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	350 std::string id = call.GetUriComponent("id", "");
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	351
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	352 JobInfo info;
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	353 if (OrthancRestApi::GetContext(call).GetJobsEngine().GetRegistry().GetJobInfo(info, id))
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	354 {
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	355 Json::Value json;
2647 73d7d95dd75e removal of internal job information Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	356 info.Format(json);
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	357 call.GetOutput().AnswerJson(json);
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	358 }
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	359 }
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	360
2582 b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	361
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	362 static void GetJobOutput(RestApiGetCall& call)
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	363 {
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	364 std::string job = call.GetUriComponent("id", "");
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	365 std::string key = call.GetUriComponent("key", "");
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	366
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	367 std::string value;
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	368 MimeType mime;
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	369
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	370 if (OrthancRestApi::GetContext(call).GetJobsEngine().
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	371 GetRegistry().GetJobOutput(value, mime, job, key))
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	372 {
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	373 call.GetOutput().AnswerBuffer(value, mime);
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	374 }
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	375 else
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	376 {
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	377 throw OrthancException(ErrorCode_InexistentItem,
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	378 "Job has no such output: " + key);
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	379 }
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	380 }
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	381
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	382
2582 b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	383 enum JobAction
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	384 {
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	385 JobAction_Cancel,
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	386 JobAction_Pause,
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	387 JobAction_Resubmit,
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	388 JobAction_Resume
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	389 };
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	390
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	391 template <JobAction action>
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	392 static void ApplyJobAction(RestApiPostCall& call)
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	393 {
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	394 std::string id = call.GetUriComponent("id", "");
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	395
2582 b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	396 bool ok = false;
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	397
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	398 switch (action)
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	399 {
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	400 case JobAction_Cancel:
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	401 ok = OrthancRestApi::GetContext(call).GetJobsEngine().GetRegistry().Cancel(id);
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	402 break;
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	403
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	404 case JobAction_Pause:
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	405 ok = OrthancRestApi::GetContext(call).GetJobsEngine().GetRegistry().Pause(id);
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	406 break;
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	407
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	408 case JobAction_Resubmit:
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	409 ok = OrthancRestApi::GetContext(call).GetJobsEngine().GetRegistry().Resubmit(id);
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	410 break;
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	411
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	412 case JobAction_Resume:
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	413 ok = OrthancRestApi::GetContext(call).GetJobsEngine().GetRegistry().Resume(id);
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	414 break;
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	415
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	416 default:
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	417 throw OrthancException(ErrorCode_InternalError);
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	418 }
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	419
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	420 if (ok)
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	421 {
2908 9d277f8ad698 new enumeration: MimeType Sebastien Jodogne <s.jodogne@gmail.com> parents: 2905 diff changeset	422 call.GetOutput().AnswerBuffer("{}", MimeType_Json);
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	423 }
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	424 }
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	425
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	426
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	427 static void GetMetricsPrometheus(RestApiGetCall& call)
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	428 {
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	429 #if ORTHANC_ENABLE_PLUGINS == 1
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	430 OrthancRestApi::GetContext(call).GetPlugins().RefreshMetrics();
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	431 #endif
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	432
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	433 static const float MEGA_BYTES = 1024 * 1024;
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	434
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	435 ServerContext& context = OrthancRestApi::GetContext(call);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	436
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	437 uint64_t diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	438 context.GetIndex().GetGlobalStatistics(diskSize, uncompressedSize, countPatients,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	439 countStudies, countSeries, countInstances);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	440
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	441 unsigned int jobsPending, jobsRunning, jobsSuccess, jobsFailed;
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	442 context.GetJobsEngine().GetRegistry().GetStatistics(jobsPending, jobsRunning, jobsSuccess, jobsFailed);
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	443
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	444 MetricsRegistry& registry = context.GetMetricsRegistry();
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	445 registry.SetValue("orthanc_disk_size_mb", static_cast<float>(diskSize) / MEGA_BYTES);
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	446 registry.SetValue("orthanc_uncompressed_size_mb", static_cast<float>(diskSize) / MEGA_BYTES);
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	447 registry.SetValue("orthanc_count_patients", static_cast<unsigned int>(countPatients));
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	448 registry.SetValue("orthanc_count_studies", static_cast<unsigned int>(countStudies));
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	449 registry.SetValue("orthanc_count_series", static_cast<unsigned int>(countSeries));
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	450 registry.SetValue("orthanc_count_instances", static_cast<unsigned int>(countInstances));
3177 053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	451 registry.SetValue("orthanc_jobs_pending", jobsPending);
053e72ff9fc5 new metrics: orthanc_jobs_[pending\|running\|completed] Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	452 registry.SetValue("orthanc_jobs_running", jobsRunning);
3179 fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	453 registry.SetValue("orthanc_jobs_completed", jobsSuccess + jobsFailed);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	454 registry.SetValue("orthanc_jobs_success", jobsSuccess);
fca730c267d7 New primitives to set and refresh metrics Sebastien Jodogne <s.jodogne@gmail.com> parents: 3177 diff changeset	455 registry.SetValue("orthanc_jobs_failed", jobsFailed);
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	456
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	457 std::string s;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	458 registry.ExportPrometheusText(s);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	459
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	460 call.GetOutput().AnswerBuffer(s, MimeType_PrometheusText);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	461 }
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	462
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	463
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	464 static void GetMetricsEnabled(RestApiGetCall& call)
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	465 {
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	466 bool enabled = OrthancRestApi::GetContext(call).GetMetricsRegistry().IsEnabled();
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	467 call.GetOutput().AnswerBuffer(enabled ? "1" : "0", MimeType_PlainText);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	468 }
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	469
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	470
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	471 static void PutMetricsEnabled(RestApiPutCall& call)
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	472 {
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	473 bool enabled;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	474
3401 962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	475 std::string body;
962e5f00744b cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3179 diff changeset	476 call.BodyToString(body);
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	477
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	478 if (body == "1")
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	479 {
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	480 enabled = true;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	481 }
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	482 else if (body == "0")
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	483 {
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	484 enabled = false;
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	485 }
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	486 else
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	487 {
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	488 throw OrthancException(ErrorCode_ParameterOutOfRange,
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	489 "The HTTP body must be 0 or 1, but found: " + body);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	490 }
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	491
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	492 // Success
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	493 OrthancRestApi::GetContext(call).GetMetricsRegistry().SetEnabled(enabled);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	494 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	495 }
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	496
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	497
3672 ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	498 static void GetLogLevel(RestApiGetCall& call)
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	499 {
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	500 std::string s;
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	501
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	502 if (Logging::IsTraceLevelEnabled())
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	503 {
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	504 s = LOG_LEVEL_TRACE;
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	505 }
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	506 else if (Logging::IsInfoLevelEnabled())
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	507 {
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	508 s = LOG_LEVEL_VERBOSE;
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	509 }
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	510 else
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	511 {
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	512 s = LOG_LEVEL_DEFAULT;
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	513 }
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	514
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	515 call.GetOutput().AnswerBuffer(s, MimeType_PlainText);
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	516 }
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	517
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	518
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	519 static void PutLogLevel(RestApiPutCall& call)
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	520 {
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	521 std::string body;
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	522 call.BodyToString(body);
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	523
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	524 if (body == LOG_LEVEL_DEFAULT)
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	525 {
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	526 Logging::EnableInfoLevel(false);
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	527 Logging::EnableTraceLevel(false);
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	528 }
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	529 else if (body == LOG_LEVEL_VERBOSE)
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	530 {
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	531 Logging::EnableInfoLevel(true);
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	532 Logging::EnableTraceLevel(false);
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	533 }
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	534 else if (body == LOG_LEVEL_TRACE)
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	535 {
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	536 Logging::EnableInfoLevel(true);
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	537 Logging::EnableTraceLevel(true);
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	538 }
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	539 else
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	540 {
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	541 throw OrthancException(ErrorCode_ParameterOutOfRange,
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	542 "The log level must be one of the following values: \"" +
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	543 std::string(LOG_LEVEL_DEFAULT) + "\", \"" +
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	544 std::string(LOG_LEVEL_VERBOSE) + "\", of \"" +
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	545 std::string(LOG_LEVEL_TRACE) + "\"");
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	546 }
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	547
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	548 // Success
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	549 LOG(WARNING) << "REST API call has switched the log level to: " << body;
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	550 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	551 }
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	552
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	553
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554 void OrthancRestApi::RegisterSystem()
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 {
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556 Register("/", ServeRoot);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	557 Register("/system", GetSystemInformation);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558 Register("/statistics", GetStatistics);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559 Register("/tools/generate-uid", GenerateUid);
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 Register("/tools/execute-script", ExecuteScript);
2475 8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	561 Register("/tools/now", GetNowIsoString<true>);
8cc3ca64a534 Orthanc now uses UTC (universal time) instead of local time in its database Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	562 Register("/tools/now-local", GetNowIsoString<false>);
1073 01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 996 diff changeset	563 Register("/tools/dicom-conformance", GetDicomConformanceStatement);
2202 9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	564 Register("/tools/default-encoding", GetDefaultEncoding);
9b373b7d6713 Fix handling of encodings in C-FIND requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2140 diff changeset	565 Register("/tools/default-encoding", SetDefaultEncoding);
3174 8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	566 Register("/tools/metrics", GetMetricsEnabled);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	567 Register("/tools/metrics", PutMetricsEnabled);
8ea7c4546c3a primitives to collect metrics in Orthanc Sebastien Jodogne <s.jodogne@gmail.com> parents: 3097 diff changeset	568 Register("/tools/metrics-prometheus", GetMetricsPrometheus);
3672 ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	569 Register("/tools/log-level", GetLogLevel);
ea8c1c0e81eb Fix issue #65 (Logging improvements) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	570 Register("/tools/log-level", PutLogLevel);
1232 f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	571
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	572 Register("/plugins", ListPlugins);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	573 Register("/plugins/{id}", GetPlugin);
f1c01451a8ee Introspection of plugins, Plugins can extend Orthanc Explorer with custom JavaScript Sebastien Jodogne <s.jodogne@gmail.com> parents: 1218 diff changeset	574 Register("/plugins/explorer.js", GetOrthancExplorerPlugins);
2573 3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	575
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	576 Register("/jobs", ListJobs);
3372c5255333 StoreScuJob, Orthanc Explorer for jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2475 diff changeset	577 Register("/jobs/{id}", GetJobInfo);
2582 b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	578 Register("/jobs/{id}/cancel", ApplyJobAction<JobAction_Cancel>);
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	579 Register("/jobs/{id}/pause", ApplyJobAction<JobAction_Pause>);
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	580 Register("/jobs/{id}/resubmit", ApplyJobAction<JobAction_Resubmit>);
b3da733d984c job actions in Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 2573 diff changeset	581 Register("/jobs/{id}/resume", ApplyJobAction<JobAction_Resume>);
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	582 Register("/jobs/{id}/{key}", GetJobOutput);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	584 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancRestApi/OrthancRestSystem.cpp @ 3705:d8b214a46b91 storage-commitment